Added CDO randomization option