new changes for servers