commit to branch out for adding chop_handshaker