Feature/r rng