Improvement of the navigation