Update to server.cpp