New HT + changes