Now supports UP navigation