making changes for the client and server integration