More intrusive diagnostics CU2