finished carousel
Revert "finished carousel"

This reverts commit 80f711ff0c911675d29e27467dbf880188f7a6cc.
finished carousel
Merge remote-tracking branch 'origin/master'