[BUILD] Randomization enhancement

Made it more window friendly