navigator changes #2
navigator changes #3