Add more animations
Merge remote-tracking branch 'origin/ed/dev2'