removed handshaking
merged