The room object is now a litle better