changes in server code