minor equivalent refinements (still with bugs)