modfiy client code