more shifts to generic p2p layer