Rewrite the animation part