Port P2P Hack to upstream