changed way of navigation