More on p2p implementation
Merge