Animation corrections
Merge conflicts