Modified calibration. added some stuff