Changes to distanceCalculator