More raw shuffling