Added some code for client side

Added some code for client side