Incorporated EAD's changes