Better nav system at last