Build Randomization

Incoporate review comments