changes to random
updated changes to random to fix merge conflict