Continue re-implementation of self energy