Modify the eventserver and client