continued modularizing calibration