more work on diagnostics