Made few changes on client side