move to totally random variables as per Mike suggestion
(#524)