Making HTP Better