Handshake refactoring done.