moved watch assignment to navService