Adding more diagnostics.