revision of the navigation (need to be continued...)