Added a shuffling option