Added initial THP modifications