new changes for server