Improve prime-nav and 1st sec-nav approach