general improvement on new nav system