did some fixing to the syncing handshake