incorporated the animation refactor