Using better shuffle algorithm