Worked a lot on calibration