improve PathFinder