Added randomization option