Updated for PHT 1.0