Working on 2-nav system