Correct Distance
Merge Commit WayPoint Distance