I added some code for the client interface