adjust client code