Nav system improved