Adding more diagnostics comments.