Suppose when we originally counted, we made a mistake and there were actually 35 rooms in the first wing of the castle, not 5. If we still convert the bricks in the second wing into the equivalent number of rooms and add them to this new total, how many rooms are now in the castle excluding the underground passage rooms?