some changes for the server