randomization improvements