Feature/calibration in progress