More changes to the server