fixing what danny just broke and integrating the animation better