Updated for HTF 12