Enhanced diagnostics version