Better add and remove animations