This issue can be fixed with one simple solution. Have one of the new Egi be an mp regenerator for party and self.