Initial version with EDM