Improved PathFinder