Add back gen3/4 rng