Allow shuffle by external method call
Update demo; shuffle after round over