In the middle of refactoring animation