Improved the animation system