refactor
fix animation