MOdifying animate, refactoring