removed crashing bug on hardware (AnimationStop) + refactoring part1