Updated animations
Conflicts