diff --git a/cube/User/Src/cmdHandler.c b/cube/User/Src/cmdHandler.c
index b828f70..1eeab86 100644
--- a/cube/User/Src/cmdHandler.c
+++ b/cube/User/Src/cmdHandler.c
@@ -14,27 +14,35 @@
 
 extern const uint8_t CMD_SOCK;
 
-uint8_t remoteAddr[] = { 172, 16, 3, 31 };
-uint16_t remotePort = 5000;
+const uint16_t cmdPort = 2000;
+
+void cmdHandlerEngine(void *handle) {
+    static uint8_t receiveBuffer[256];
 
-void cmdHandler(void *handle) {
     static uint8_t state = 0;
-    int8_t res = 0;
-    int16_t res16 = 0;
-    int32_t res32 = 0;
 
-    static uint8_t message[] = "Hello world\n\r";
+    static uint8_t banner[] = \
+      "MBGW3\n\r" \
+      "Type help for usage help\n\r" \
+      "or quit to close the connection.\n\r";
+      
+
+    int8_t res = 0;
+    uint8_t sockState;
+    int32_t resultSend;
+    int16_t receivedOctets;
+    int32_t resultRecv;
 
     if (isNetworkAvailable()) {
         switch (state) {
         case 0:
-            coloredMsg(LOG_YELLOW, "tth, initializing socket");
+            coloredMsg(LOG_YELLOW, "che, initializing socket");
 
-            res = socket(CMD_SOCK, Sn_MR_TCP, 12345, SF_IO_NONBLOCK);
-            coloredMsg(LOG_YELLOW, "tth, socket returns %d", res);
+            res = socket(CMD_SOCK, Sn_MR_TCP, cmdPort, SF_IO_NONBLOCK);
+            coloredMsg(LOG_YELLOW, "che, socket returns %d", res);
 
             if (res == CMD_SOCK) {
-                coloredMsg(LOG_YELLOW, "tth, socket is initialized");
+                coloredMsg(LOG_YELLOW, "che, socket is initialized");
                 state = 1;
             } else {
                 state = 255;
@@ -42,13 +50,13 @@ void cmdHandler(void *handle) {
             break;
 
         case 1:
-            coloredMsg(LOG_YELLOW, "tth, connecting");
+            coloredMsg(LOG_YELLOW, "che, listening");
             
-            res = connect(CMD_SOCK, remoteAddr, remotePort);
-            coloredMsg(LOG_YELLOW, "tth, connect returns %d", res);
+            res = listen(CMD_SOCK);
+            coloredMsg(LOG_YELLOW, "che, listen returns %d", res);
 
             if (res == SOCK_BUSY) {
-                coloredMsg(LOG_YELLOW, "tth, ok, waiting for established");
+                coloredMsg(LOG_YELLOW, "che, ok, waiting for established");
                 state = 2;
             } else {
                 state = 255;
@@ -56,54 +64,52 @@ void cmdHandler(void *handle) {
             break;
 
         case 2:
-            coloredMsg(LOG_YELLOW, "tth, waiting for established");
+            coloredMsg(LOG_YELLOW, "che, waiting for established");
 
-            uint8_t sockState = getSn_SR(CMD_SOCK);
-            coloredMsg(LOG_YELLOW, "tth, socket state is 0x%02x", sockState);
+            sockState = getSn_SR(CMD_SOCK);
+            coloredMsg(LOG_YELLOW, "che, socket state is 0x%02x", sockState);
 
             if (sockState == SOCK_ESTABLISHED) {
-                coloredMsg(LOG_YELLOW, "tth, connection is established");
+                coloredMsg(LOG_YELLOW, "che, connection is established");
                 state = 3;
             }
             break;
 
         case 3:
-            coloredMsg(LOG_YELLOW, "tth, now sending something");
+            coloredMsg(LOG_YELLOW, "che, send banner");
 
-            res32 = send(CMD_SOCK, message, strlen(message));
-            coloredMsg(LOG_YELLOW, "tth, sent a message, send returns 0x%02x", res32);
+            resultSend = send(CMD_SOCK, banner, strlen(banner));
+            coloredMsg(LOG_YELLOW, "che, sent banner, send returns 0x%02x", resultSend);
 
             state = 4;
             break;
 
         case 4:
-            // coloredMsg(LOG_YELLOW, "tth, now waiting for some input");
-            res16 = getSn_RX_RSR(CMD_SOCK);
-            // coloredMsg(LOG_YELLOW, "tth, getSn_RxMAX returns %d", res16);
+            // coloredMsg(LOG_YELLOW, "che, now waiting for some input");
+            receivedOctets = getSn_RX_RSR(CMD_SOCK);
+            // coloredMsg(LOG_YELLOW, "che, getSn_RxMAX returns %d", res16);
 
-            if (res16 > 0) {
-                uint8_t *buf = (uint8_t*) malloc(res16);
-                memset(buf, 0, res16);
-                res32 = recv(CMD_SOCK, buf, res16);
-                coloredMsg(LOG_YELLOW, "tth, recv returns 0x%02x", res32);
-                if (res32 > 0) {
-                    coloredMsg(LOG_YELLOW, "tth, received: %d, %s", res32, buf);
+            if (receivedOctets > 0) {
+                memset(receiveBuffer, 0, sizeof(receiveBuffer));
+                resultRecv = recv(CMD_SOCK, receiveBuffer, sizeof(receiveBuffer));
+                coloredMsg(LOG_YELLOW, "che, recv returns 0x%02x", resultRecv);
+                if (resultRecv > 0) {
+                    coloredMsg(LOG_YELLOW, "che, received: %s", receiveBuffer);
                 }
-                free(buf);
             }
 
             break;
 
         case 255:
-            coloredMsg(LOG_YELLOW, "tth, error state, will stop here");
-            schDel(cmdHandler, NULL);
+            coloredMsg(LOG_YELLOW, "che, error state, will stop here");
+            schDel(cmdHandlerEngine, NULL);
             break;
         }
     } else {
-        coloredMsg(LOG_YELLOW, "tth, network not yet ready");
+        coloredMsg(LOG_YELLOW, "che, network not yet ready");
     }
 }
 
 void cmdHandlerInit() {
-    schAdd(cmdHandler, NULL, 0, 100);
+    schAdd(cmdHandlerEngine, NULL, 0, 100);
 }
\ No newline at end of file