Added shuffle (unfinished)