fixing-motion-performance

Fix animation performance issues.