Updated to EDR changes