Multipoint Calibration 2.0