updated version with p2p-prefix