Additional modifications to pathfinding