Some improvements on the animations