Bring back p2p for Toro