Improved Dynamic Navigation