Updated structure, added check for room occupancy