revert back to EDAnalyzer class definition