Animations
Merge of Joost his changes