added more calibration parameters