consolidation of pages and handlers --KW