Coolness
Fixes awkwardness in animation
merging master