Animations
..
Merged updates
Resolved conflict
Added variable