navigation logic changed