Diagnostic and Control Upgrades