Improvements in Randomizer