new animation, fixed bugs