Updated diagnostics