optimizing delegation new/edit WIP