simplification of navigation code