Added organization randomization