Animations still a bit slow