Reworked on SOP calibration