Updates to HT mode