added detailed room selection