removed redundancy
added animations