heavy animation-refactoring