Refactoring animation
Animation ready