Added 2PCP as far as possible without logging