PHeads - more improvements