Fixed up randomization