Added structure for the handshakes.
Removed shakes