3 Commits (animation-fix)