Added constants and sop calibration