Improving diagnostics