Revert "removing shuffle option"

This reverts commit f25dc7b2fb00a4300e319b9665d132e476f31969.