Added randomization feature