navigation consolidation (in progress)