Added return values to calculate calibration service