More work on pathfinder.