Implemented client changes