Single waypoint Calculation and unintegrated distance comparisons added