fixed handshake and issue with connection manager