add more diagnostics