Shuffle working
Merge branch 'shuffle-new'