new navigation

included in both header files