Before Animation Refactoring