Add shuffle
Refactor syntax
shuffle