Updating more of the server code.