changes for server side