working on diagnostics