Radical rework of internal processing / calibration