Adding the randomization option