Fixed the shuffle to be better.