WiP to deal with degeneracies