Added some calibration stuff