Update animation, add tracking