improved (less optimized, too) navigation strategy