new version for PfF