Merged animation and changes