modify from edp1 1