Time class changes, animation fix