updated animation, reset and more