more h to hh changes