added calibrate flag