Calibration enhancements

Can you put this at the end of the struct, instead?