Nav improved