WIP Upgrade EGamma