More intrusive diagnostics CU