Revert "Revert "Animation Improvement""

This reverts commit 62f3ab2c7ceea967c8fa94f03d067808e3bb1426.