improved scope consolidation