All Eigs issues addressed