client side modifications done