PHeads - more improvments