still fixing the navigator