modify from edp1