Made few tweaks for randoms