Revert to traditional animation, (for stable & speed)
Merge remote-tracking branch 'origin/master'