Modify server/client