updated with live calibration