adding latest code for the client