added EDM extractor