CF_P2B: some progress, still wrong.