add GenerateRandom number
resolved merge conflicts
Final set of changes
resolvign commit