Added shuffling.