minor changes to the client code