Added randomization