overhauling THF to match Mote's TH updates