Updated pathfinder