Adding more methods for handshaking