Changed the way calibrated parameters are held