changes to the server code