changes for server