Play around more with extraction

Equality needs to be simplified