Added a conditional for organization randomization