Add some stuff for HTF, lots of comments