The new code does not use currentLocation.