added two new animations, refactored a bit