Improve status randomization