[IMP] edi algo is now compatible with new data model