added stateless RNG, need to verify some more cases