EDEF Upgrade