Improvements to RNG