More re-doing of animation.