Some changes to animation