added handshake data
ensured that the handshake data is also used when a reconnect is needed