Simplified some of the animations.