Now handles missing calibration points