Animation improvments