Improved randomization.