AnimationController Refactored