changed the signature of check fns
Merge conflict
Bullet proof (hopefully) the 'same-as' checker