Added the client side code