redid (incompatibly) HashAdaptor code - and about to change again