Tested and improved animation.