Factory Navigation Upgrades