diff --git a/demos/chartthemes/themewidget.cpp b/demos/chartthemes/themewidget.cpp
index 6b68278..935bb37 100644
--- a/demos/chartthemes/themewidget.cpp
+++ b/demos/chartthemes/themewidget.cpp
@@ -26,6 +26,7 @@
 #include <QAbstractBarSeries>
 #include <QPercentBarSeries>
 #include <QStackedBarSeries>
+#include <QBarSeries>
 #include <QBarSet>
 #include <QLineSeries>
 #include <QSplineSeries>
diff --git a/src/animations/abstractbaranimation.cpp b/src/animations/abstractbaranimation.cpp
new file mode 100644
index 0000000..e3f9faf
--- /dev/null
+++ b/src/animations/abstractbaranimation.cpp
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the Qt Commercial Charts Add-on.
+**
+** $QT_BEGIN_LICENSE$
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "abstractbaranimation_p.h"
+#include "barchartitem_p.h"
+#include <QTimer>
+#include <QDebug>
+
+Q_DECLARE_METATYPE(QVector<QRectF>)
+
+QTCOMMERCIALCHART_BEGIN_NAMESPACE
+
+AbstractBarAnimation::AbstractBarAnimation(BarChartItem *item)
+    :ChartAnimation(item),
+    m_item(item)
+{
+    setDuration(ChartAnimationDuration);
+    setEasingCurve(QEasingCurve::OutQuart);
+}
+
+AbstractBarAnimation::~AbstractBarAnimation()
+{
+}
+
+QVariant AbstractBarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
+{
+    Q_UNUSED(from);
+    Q_UNUSED(to);
+    Q_UNUSED(progress);
+    qWarning() << "AbstractBarAnimation::interpolated called";
+    return to;
+}
+
+void AbstractBarAnimation::updateCurrentValue(const QVariant &value)
+{
+    QVector<QRectF> layout = qVariantValue<QVector<QRectF> >(value);
+    m_item->setLayout(layout);
+}
+
+void AbstractBarAnimation::setup(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
+{
+    setKeyValueAt(0.0, qVariantFromValue(oldLayout));
+    setKeyValueAt(1.0, qVariantFromValue(newLayout));
+}
+
+#include "moc_abstractbaranimation_p.cpp"
+
+QTCOMMERCIALCHART_END_NAMESPACE
+
diff --git a/src/animations/abstractbaranimation_p.h b/src/animations/abstractbaranimation_p.h
new file mode 100644
index 0000000..c5d6c3c
--- /dev/null
+++ b/src/animations/abstractbaranimation_p.h
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the Qt Commercial Charts Add-on.
+**
+** $QT_BEGIN_LICENSE$
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the QtCommercial Chart API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+
+#ifndef ABSTRACTBARANIMATION_P_H
+#define ABSTRACTBARANIMATION_P_H
+
+#include "chartanimation_p.h"
+
+QTCOMMERCIALCHART_BEGIN_NAMESPACE
+
+class BarChartItem;
+
+class AbstractBarAnimation : public ChartAnimation
+{
+    Q_OBJECT
+
+public:
+    AbstractBarAnimation(BarChartItem *item);
+    ~AbstractBarAnimation();
+
+public: // from QVariantAnimation
+    virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const;
+    virtual void updateCurrentValue(const QVariant &value);
+
+    void setup(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout);
+
+protected:
+    BarChartItem *m_item;
+};
+
+QTCOMMERCIALCHART_END_NAMESPACE
+
+#endif // ABSTRACTBARANIMATION_P_H
diff --git a/src/animations/animations.pri b/src/animations/animations.pri
index 7558500..783236f 100644
--- a/src/animations/animations.pri
+++ b/src/animations/animations.pri
@@ -10,8 +10,8 @@ SOURCES += \
     $$PWD/splineanimation.cpp \
     $$PWD/baranimation.cpp \
     $$PWD/stackedbaranimation.cpp \
-    $$PWD/percentbaranimation.cpp
-
+    $$PWD/percentbaranimation.cpp \
+    $$PWD/abstractbaranimation.cpp
 
 
 PRIVATE_HEADERS += \
@@ -24,4 +24,5 @@ PRIVATE_HEADERS += \
     $$PWD/splineanimation_p.h \
     $$PWD/baranimation_p.h \
     $$PWD/stackedbaranimation_p.h \
-    $$PWD/percentbaranimation_p.h
+    $$PWD/percentbaranimation_p.h \
+    $$PWD/abstractbaranimation_p.h
diff --git a/src/animations/baranimation.cpp b/src/animations/baranimation.cpp
index 6e5bbbe..22d453e 100644
--- a/src/animations/baranimation.cpp
+++ b/src/animations/baranimation.cpp
@@ -27,9 +27,9 @@ Q_DECLARE_METATYPE(QVector<QRectF>)
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
 BarAnimation::BarAnimation(BarChartItem *item)
-    :ChartAnimation(item),
-    m_item(item)
+    :AbstractBarAnimation(item)
 {
+    setDuration(ChartAnimationDuration);
     setEasingCurve(QEasingCurve::OutQuart);
 }
 
@@ -57,20 +57,6 @@ QVariant BarAnimation::interpolated(const QVariant &from, const QVariant &to, qr
     return qVariantFromValue(result);
 }
 
-void BarAnimation::updateCurrentValue(const QVariant &value)
-{
-    QVector<QRectF> layout = qVariantValue<QVector<QRectF> >(value);
-    m_item->setLayout(layout);
-}
-
-void BarAnimation::updateLayout(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
-{
-    setDuration(ChartAnimationDuration);
-    setKeyValueAt(0.0, qVariantFromValue(oldLayout));
-    setKeyValueAt(1.0, qVariantFromValue(newLayout));
-    QTimer::singleShot(0, this, SLOT(start()));
-}
-
 #include "moc_baranimation_p.cpp"
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/animations/baranimation_p.h b/src/animations/baranimation_p.h
index a1df554..0db25f1 100644
--- a/src/animations/baranimation_p.h
+++ b/src/animations/baranimation_p.h
@@ -30,16 +30,15 @@
 #ifndef BARANIMATION_P_H
 #define BARANIMATION_P_H
 
+#include "abstractbaranimation_p.h"
 #include "chartanimation_p.h"
 #include "barchartitem_p.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
 class BarChartItem;
-class QBarSet;
-class BarSetAnimation;
 
-class BarAnimation : public ChartAnimation
+class BarAnimation : public AbstractBarAnimation
 {
     Q_OBJECT
 
@@ -49,12 +48,6 @@ public:
 
 public: // from QVariantAnimation
     virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const;
-    virtual void updateCurrentValue(const QVariant &value);
-
-    void updateLayout(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout);
-
-private:
-    BarChartItem *m_item;
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/animations/chartanimator.cpp b/src/animations/chartanimator.cpp
index 276ca61..d854660 100644
--- a/src/animations/chartanimator.cpp
+++ b/src/animations/chartanimator.cpp
@@ -61,43 +61,6 @@ void ChartAnimator::addAnimation(PieChartItem *item)
     item->setAnimator(this);
 }
 
-void ChartAnimator::addAnimation(BarChartItem *item)
-{
-    // This can handle also GroupedBarChartItem because bars are side by side
-    ChartAnimation *animation = m_animations.value(item);
-
-    if (!animation) {
-        animation = new BarAnimation(item);
-        m_animations.insert(item, animation);
-    }
-
-    item->setAnimator(this);
-}
-
-void ChartAnimator::addAnimation(StackedBarChartItem *item)
-{
-    ChartAnimation *animation = m_animations.value(item);
-
-    if (!animation) {
-        animation = new StackedBarAnimation(item);
-        m_animations.insert(item, animation);
-    }
-
-    item->setAnimator(this);
-}
-
-void ChartAnimator::addAnimation(PercentBarChartItem *item)
-{
-    ChartAnimation *animation = m_animations.value(item);
-
-    if (!animation) {
-        animation = new PercentBarAnimation(item);
-        m_animations.insert(item, animation);
-    }
-
-    item->setAnimator(this);
-}
-
 void ChartAnimator::removeAnimation(Chart *item)
 {
     item->setAnimator(0);
@@ -125,44 +88,6 @@ void ChartAnimator::updateAnimation(PieChartItem *item, PieSliceItem *sliceItem,
     animation->updateValue(sliceItem, sliceData);
 }
 
-void ChartAnimator::updateLayout(BarChartItem *item, const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
-{
-    BarAnimation *animation = static_cast<BarAnimation *>(m_animations.value(item));
-    if (animation) {
-        m_animations.remove(item);
-        animation->deleteLater();
-        animation = 0;
-        addAnimation(item);
-    }
-    animation = static_cast<BarAnimation *>(m_animations.value(item));
-    animation->updateLayout(oldLayout,newLayout);
-}
-
-void ChartAnimator::updateLayout(StackedBarChartItem *item, const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
-{
-    StackedBarAnimation *animation = static_cast<StackedBarAnimation *>(m_animations.value(item));
-    if (animation) {
-        m_animations.remove(item);
-        animation->deleteLater();
-        animation = 0;
-        addAnimation(item);
-    }
-    animation = static_cast<StackedBarAnimation *>(m_animations.value(item));
-    animation->updateLayout(oldLayout,newLayout);
-}
-
-void ChartAnimator::updateLayout(PercentBarChartItem *item, const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
-{
-    PercentBarAnimation *animation = static_cast<PercentBarAnimation *>(m_animations.value(item));
-    if (animation) {
-        m_animations.remove(item);
-        animation->deleteLater();
-        animation = 0;
-        addAnimation(item);
-    }
-    animation = static_cast<PercentBarAnimation *>(m_animations.value(item));
-    animation->updateLayout(oldLayout,newLayout);
-}
 #include "moc_chartanimator_p.cpp"
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/animations/chartanimator_p.h b/src/animations/chartanimator_p.h
index d2c9c53..53db1e1 100644
--- a/src/animations/chartanimator_p.h
+++ b/src/animations/chartanimator_p.h
@@ -55,19 +55,12 @@ public:
     virtual ~ChartAnimator();
 
     void addAnimation(PieChartItem *item);
-    void addAnimation(BarChartItem *item);
-    void addAnimation(StackedBarChartItem *item);
-    void addAnimation(PercentBarChartItem *item);
     void removeAnimation(Chart *item);
 
     void addAnimation(PieChartItem *item, PieSliceItem *sliceItem, const PieSliceData &sliceData, bool isEmpty);
     void removeAnimation(PieChartItem *item, PieSliceItem *sliceItem);
     void updateAnimation(PieChartItem *item, PieSliceItem *sliceItem, const PieSliceData &sliceData);
 
-    void updateLayout(BarChartItem *item, const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout);
-    void updateLayout(StackedBarChartItem *item, const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout);
-    void updateLayout(PercentBarChartItem *item, const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout);
-
 private:
      QMap<Chart *, ChartAnimation *> m_animations;
 };
diff --git a/src/animations/percentbaranimation.cpp b/src/animations/percentbaranimation.cpp
index ad0356e..74132ed 100644
--- a/src/animations/percentbaranimation.cpp
+++ b/src/animations/percentbaranimation.cpp
@@ -26,10 +26,10 @@ Q_DECLARE_METATYPE(QVector<QRectF>)
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-PercentBarAnimation::PercentBarAnimation(BarChartItem *item)
-    :ChartAnimation(item),
-    m_item(item)
+PercentBarAnimation::PercentBarAnimation(PercentBarChartItem *item)
+    :AbstractBarAnimation(item)
 {
+    setDuration(ChartAnimationDuration);
     setEasingCurve(QEasingCurve::OutQuart);
 }
 
@@ -59,20 +59,6 @@ QVariant PercentBarAnimation::interpolated(const QVariant &from, const QVariant 
     return qVariantFromValue(result);
 }
 
-void PercentBarAnimation::updateCurrentValue(const QVariant &value)
-{
-    QVector<QRectF> layout = qVariantValue<QVector<QRectF> >(value);
-    m_item->setLayout(layout);
-}
-
-void PercentBarAnimation::updateLayout(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
-{
-    setDuration(ChartAnimationDuration);
-    setKeyValueAt(0.0, qVariantFromValue(oldLayout));
-    setKeyValueAt(1.0, qVariantFromValue(newLayout));
-    QTimer::singleShot(0, this, SLOT(start()));
-}
-
 #include "moc_percentbaranimation_p.cpp"
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/animations/percentbaranimation_p.h b/src/animations/percentbaranimation_p.h
index 1f06675..1e89638 100644
--- a/src/animations/percentbaranimation_p.h
+++ b/src/animations/percentbaranimation_p.h
@@ -11,6 +11,7 @@
 #define PERCENTBARANIMATION_P_H
 
 #include "chartanimation_p.h"
+#include "abstractbaranimation_p.h"
 #include "barchartitem_p.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
@@ -19,23 +20,14 @@ class PercentBarChartItem;
 class QBarSet;
 class BarSetAnimation;
 
-class PercentBarAnimation : public ChartAnimation
+class PercentBarAnimation : public AbstractBarAnimation
 {
     Q_OBJECT
 public:
-    PercentBarAnimation(BarChartItem *item);
+    PercentBarAnimation(PercentBarChartItem *item);
     ~PercentBarAnimation();
 
-public:
     virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const;
-    virtual void updateCurrentValue(const QVariant &value);
-
-    void updateLayout(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout);
-
-private:
-    BarChartItem *m_item;
-    QHash<QBarSet *, BarSetAnimation *> m_animations;
-
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/animations/stackedbaranimation.cpp b/src/animations/stackedbaranimation.cpp
index 640b7c9..347a7bb 100644
--- a/src/animations/stackedbaranimation.cpp
+++ b/src/animations/stackedbaranimation.cpp
@@ -26,9 +26,8 @@ Q_DECLARE_METATYPE(QVector<QRectF>)
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
-StackedBarAnimation::StackedBarAnimation(BarChartItem *item)
-    :ChartAnimation(item),
-    m_item(item)
+StackedBarAnimation::StackedBarAnimation(StackedBarChartItem *item)
+    :AbstractBarAnimation(item)
 {
     setEasingCurve(QEasingCurve::OutQuart);
 }
@@ -59,20 +58,6 @@ QVariant StackedBarAnimation::interpolated(const QVariant &from, const QVariant 
     return qVariantFromValue(result);
 }
 
-void StackedBarAnimation::updateCurrentValue(const QVariant &value)
-{
-    QVector<QRectF> layout = qVariantValue<QVector<QRectF> >(value);
-    m_item->setLayout(layout);
-}
-
-
-void StackedBarAnimation::updateLayout(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
-{
-    setDuration(ChartAnimationDuration);
-    setKeyValueAt(0.0, qVariantFromValue(oldLayout));
-    setKeyValueAt(1.0, qVariantFromValue(newLayout));
-    QTimer::singleShot(0, this, SLOT(start()));
-}
 #include "moc_stackedbaranimation_p.cpp"
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/animations/stackedbaranimation_p.h b/src/animations/stackedbaranimation_p.h
index dd6a45b..2de4988 100644
--- a/src/animations/stackedbaranimation_p.h
+++ b/src/animations/stackedbaranimation_p.h
@@ -12,6 +12,7 @@
 
 #include "chartanimation_p.h"
 #include "barchartitem_p.h"
+#include "abstractbaranimation_p.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
@@ -19,23 +20,14 @@ class StackedBarChartItem;
 class QBarSet;
 class BarSetAnimation;
 
-class StackedBarAnimation : public ChartAnimation
+class StackedBarAnimation : public AbstractBarAnimation
 {
     Q_OBJECT
 public:
-    StackedBarAnimation(BarChartItem *item);
+    StackedBarAnimation(StackedBarChartItem *item);
     ~StackedBarAnimation();
 
-public:
     virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const;
-    virtual void updateCurrentValue(const QVariant &value);
-
-    void updateLayout(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout);
-
-private:
-    BarChartItem *m_item;
-    QHash<QBarSet *, BarSetAnimation *> m_animations;
-
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/barchart/barchartitem.cpp b/src/barchart/barchartitem.cpp
index bd33810..2903aad 100644
--- a/src/barchart/barchartitem.cpp
+++ b/src/barchart/barchartitem.cpp
@@ -27,6 +27,7 @@
 #include "qchart.h"
 #include "chartpresenter_p.h"
 #include "chartanimator_p.h"
+#include "abstractbaranimation_p.h"
 #include "chartdataset_p.h"
 #include <QPainter>
 
@@ -34,6 +35,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
 BarChartItem::BarChartItem(QAbstractBarSeries *series, ChartPresenter *presenter) :
     ChartItem(presenter),
+    m_animation(0),
     m_series(series)
 {
     setFlag(ItemClipsChildrenToShape);
@@ -121,14 +123,21 @@ QVector<QRectF> BarChartItem::calculateLayout()
 
 void BarChartItem::applyLayout(const QVector<QRectF> &layout)
 {
-    if (animator()) {
-        animator()->updateLayout(this, m_layout, layout);
+    if (m_animation) {
+        m_animation->setup(m_layout,layout);
+        presenter()->startAnimation(m_animation);
+
     } else {
         setLayout(layout);
         update();
     }
 }
 
+void BarChartItem::setAnimation(AbstractBarAnimation *animation)
+{
+    m_animation = animation;
+}
+
 void BarChartItem::setLayout(const QVector<QRectF> &layout)
 {
     if (layout.count() != m_bars.count())
diff --git a/src/barchart/barchartitem_p.h b/src/barchart/barchartitem_p.h
index 6318e34..c8382c9 100644
--- a/src/barchart/barchartitem_p.h
+++ b/src/barchart/barchartitem_p.h
@@ -41,6 +41,7 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 class Bar;
 class QAxisCategories;
 class QChart;
+class AbstractBarAnimation;
 
 class BarChartItem : public ChartItem
 {
@@ -55,9 +56,11 @@ public:
 
     virtual QVector<QRectF> calculateLayout();
     virtual void applyLayout(const QVector<QRectF> &layout);
+    virtual void setAnimation(AbstractBarAnimation* animation);
     void setLayout(const QVector<QRectF> &layout);
     void updateLayout(const QVector<QRectF> &layout);
 
+
     QRectF geometry() const { return m_rect;}
 
 public Q_SLOTS:
@@ -78,6 +81,8 @@ protected:
     QRectF m_rect;
     QVector<QRectF> m_layout;
 
+    AbstractBarAnimation *m_animation;
+
     // Not owned.
     QAbstractBarSeries *m_series;
     QList<Bar *> m_bars;
diff --git a/src/barchart/percentbarchartitem.cpp b/src/barchart/percentbarchartitem.cpp
index e4960e7..a42974a 100644
--- a/src/barchart/percentbarchartitem.cpp
+++ b/src/barchart/percentbarchartitem.cpp
@@ -97,15 +97,6 @@ QVector<QRectF> PercentBarChartItem::calculateLayout()
     return layout;
 }
 
-void PercentBarChartItem::applyLayout(const QVector<QRectF> &layout)
-{
-    if (animator()) {
-        animator()->updateLayout(this, m_layout, layout);
-    } else {
-        setLayout(layout);
-        update();
-    }
-}
 #include "moc_percentbarchartitem_p.cpp"
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/barchart/percentbarchartitem_p.h b/src/barchart/percentbarchartitem_p.h
index 71a2a3f..ea40263 100644
--- a/src/barchart/percentbarchartitem_p.h
+++ b/src/barchart/percentbarchartitem_p.h
@@ -46,7 +46,6 @@ public:
 
 private:
     virtual QVector<QRectF> calculateLayout();
-    virtual void applyLayout(const QVector<QRectF> &layout);
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/barchart/qabstractbarseries.cpp b/src/barchart/qabstractbarseries.cpp
index 2a63fda..6b75ad5 100644
--- a/src/barchart/qabstractbarseries.cpp
+++ b/src/barchart/qabstractbarseries.cpp
@@ -578,15 +578,9 @@ void QAbstractBarSeriesPrivate::scaleDomain(Domain& domain)
 
 Chart* QAbstractBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
 {
-    Q_Q(QAbstractBarSeries);
-
-    BarChartItem* bar = new BarChartItem(q,presenter);
-    if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
-        presenter->animator()->addAnimation(bar);
-    }
-    presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
-    return bar;
-
+    Q_UNUSED(presenter);
+    qWarning() << "QAbstractBarSeriesPrivate::createGraphics called";
+    return 0;
 }
 
 QList<LegendMarker*> QAbstractBarSeriesPrivate::createLegendMarker(QLegend* legend)
diff --git a/src/barchart/qbarseries.cpp b/src/barchart/qbarseries.cpp
index 2a6d7d1..2bd5108 100644
--- a/src/barchart/qbarseries.cpp
+++ b/src/barchart/qbarseries.cpp
@@ -24,6 +24,7 @@
 #include "chartdataset_p.h"
 #include "charttheme_p.h"
 #include "chartanimator_p.h"
+#include "baranimation_p.h"
 #include "qvaluesaxis.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
@@ -105,13 +106,13 @@ Chart* QBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
 
     GroupedBarChartItem* bar = new GroupedBarChartItem(q,presenter);
     if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
-        presenter->animator()->addAnimation(bar);
+        bar->setAnimator(presenter->animator());
+        bar->setAnimation(new BarAnimation(bar));
     }
     presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
     return bar;
 }
 
-
 #include "moc_qbarseries.cpp"
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/barchart/qpercentbarseries.cpp b/src/barchart/qpercentbarseries.cpp
index 9168240..0c52050 100644
--- a/src/barchart/qpercentbarseries.cpp
+++ b/src/barchart/qpercentbarseries.cpp
@@ -25,6 +25,7 @@
 #include "charttheme_p.h"
 #include "chartanimator_p.h"
 #include "qvaluesaxis.h"
+#include "percentbaranimation_p.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
@@ -104,7 +105,8 @@ Chart* QPercentBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
 
     PercentBarChartItem* bar = new PercentBarChartItem(q,presenter);
     if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
-        presenter->animator()->addAnimation(bar);
+        bar->setAnimator(presenter->animator());
+        bar->setAnimation(new PercentBarAnimation(bar));
     }
     presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
     return bar;
diff --git a/src/barchart/qstackedbarseries.cpp b/src/barchart/qstackedbarseries.cpp
index f687e81..652b228 100644
--- a/src/barchart/qstackedbarseries.cpp
+++ b/src/barchart/qstackedbarseries.cpp
@@ -25,6 +25,7 @@
 #include "charttheme_p.h"
 #include "chartanimator_p.h"
 #include "qvaluesaxis.h"
+#include "stackedbaranimation_p.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
@@ -106,7 +107,8 @@ Chart* QStackedBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
 
     StackedBarChartItem* bar = new StackedBarChartItem(q,presenter);
     if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
-        presenter->animator()->addAnimation(bar);
+        bar->setAnimator(presenter->animator());
+        bar->setAnimation(new StackedBarAnimation(bar));
     }
     presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
     return bar;
diff --git a/src/barchart/stackedbarchartitem.cpp b/src/barchart/stackedbarchartitem.cpp
index b119017..e1895cb 100644
--- a/src/barchart/stackedbarchartitem.cpp
+++ b/src/barchart/stackedbarchartitem.cpp
@@ -90,16 +90,6 @@ QVector<QRectF> StackedBarChartItem::calculateLayout()
     return layout;
 }
 
-void StackedBarChartItem::applyLayout(const QVector<QRectF> &layout)
-{
-    if (animator()) {
-        animator()->updateLayout(this, m_layout, layout);
-    } else {
-        setLayout(layout);
-        update();
-    }
-}
-
 #include "moc_stackedbarchartitem_p.cpp"
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/barchart/stackedbarchartitem_p.h b/src/barchart/stackedbarchartitem_p.h
index 3148556..4d7609c 100644
--- a/src/barchart/stackedbarchartitem_p.h
+++ b/src/barchart/stackedbarchartitem_p.h
@@ -45,7 +45,6 @@ public:
 
 private:
     virtual QVector<QRectF> calculateLayout();
-    virtual void applyLayout(const QVector<QRectF> &layout);
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE