Reworked shuffle a bit.