added in correct path finding
Merge