added animations
merged stuff