More changes. Pathfinding