new diagnostics implementation