refactored on animation logic