Updated IntCalCalibrator to actually work