diff --git a/echoserver/echoserver.c b/echoserver/echoserver.c
index 81cd0d9..12775fd 100644
--- a/echoserver/echoserver.c
+++ b/echoserver/echoserver.c
@@ -91,7 +91,7 @@ int main(int argc, char **argv)
             printf("\nConnection received.\n");
         }
         // grab the data from the client, save to message.
-        messageBytes = recv(clientEchoFD, message, BUFFER_SIZE, MSG_WAITALL);
+        messageBytes = recv(clientEchoFD, message, BUFFER_SIZE, 0);
         // if "01189998811991197253\r\n" is received, then close the server.
         if (strcmp(message, "01189998811991197253\n") == 0 || strcmp(message, "01189998811991197253\r\n") == 0)
         {
@@ -115,7 +115,7 @@ int main(int argc, char **argv)
             printf("\nMESSAGE SENT\n");
         }
         // close the accepted listening socket since it is no longer needed.
-        close(clientEchoFD);
+        // close(clientEchoFD);
     }
     // close the socket
     close(socketEchoFD);