P2P revised