switch to using dh_prep