Still has a bug
will be reverted
Revert "will be reverted"

This reverts commit 739c1e6b269f6385c228f20ddd1db4db24c6ee64.
Finished but no animation
Merge remote-tracking branch 'origin/master' into gh-pages