Updating for EDD Master Branch