add client part too
changes