Added PathFinder back in