Edited issues with animation