fixed calibration to some point
merging