More anmation improvments