improved equivalence definitions a little