More intrusive diagnostics