improve randomizer