CHG: Improve randomness