slight changes in client interface