refinemetns on diagnostics