Victor's edits to randomize