Simplified the animation calculations a bit