Changes to facilitate summary-only mode