Adding some diagnostics comments.