More HB updates