Added client side code