add calibrate
merge