update to support version 2.0+ with new calibration factors
add implicit and explicit version support