Justin - more pf changes