Work on calibration procedure
Merge