Now using 2 calls to GenRand per room