Updated for new navigation functionality