Added order randomization