Add separate calibration