Continuation of work on pathfinder.