tweaks to client code