Navigation logic change