Readded shuffle should we choose to use it later.