fix animation
refactor
fix animation