updated with newer nav code