changes to server.c