Extra bits from Architecture and Castles.
