updated code, added animations