Added calibration and target update