initial merge
added animations