modify server to work