modify server for right events