Added some calibration functionality