diagnostics re-added