changed to use the new make-preobj-hashes; tested