Rooms now pretty ok