Change some client code