Small changes to room changing