Architecture in context : fitting new buildings with old