Added customized shuffling