last but not least some changes for the server