navigator refactoring part 2