Ordering ADP & e-NP in NavTracker