Updated logic, added animations