Update With a lot more animations added