Add animation
Merge branch 'camera'