refactored the animation
Merge branch 'step21'