diff --git a/nucleo-wb55-dongle-ble/STM32_WPAN/App/app_ble.c b/nucleo-wb55-dongle-ble/STM32_WPAN/App/app_ble.c
index 6c183c4..43dec43 100644
--- a/nucleo-wb55-dongle-ble/STM32_WPAN/App/app_ble.c
+++ b/nucleo-wb55-dongle-ble/STM32_WPAN/App/app_ble.c
@@ -39,7 +39,7 @@
 
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
-
+#include "commands.h"
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/
@@ -341,7 +341,7 @@ void APP_BLE_Init( void )
   UTIL_SEQ_SetTask(1 << CFG_TASK_START_SCAN_ID, CFG_SCH_PRIO_0);
 #endif
 /* USER CODE BEGIN APP_BLE_Init_2 */
-
+  log_debug("APP_BLE_Init", "done", 0);
 /* USER CODE END APP_BLE_Init_2 */
   return;
 }
@@ -360,6 +360,7 @@ SVCCTL_UserEvtFlowStatus_t SVCCTL_App_Notification( void *pckt )
   int k = 0;
   uint8_t adtype, adlength;
 
+  log_debug("SVCCTL_App_Notification", "enter, event=%n", 1, event_pckt->evt);
   switch (event_pckt->evt)
   {
     /* USER CODE BEGIN evt */
@@ -794,6 +795,7 @@ static void Scan_Request( void )
 {
   /* USER CODE BEGIN Scan_Request_1 */
 
+  log_debug("Scan_Request", "enter", 0);
   /* USER CODE END Scan_Request_1 */
   tBleStatus result;
   if (BleApplicationContext.Device_Connection_Status != APP_BLE_CONNECTED_CLIENT)
@@ -806,6 +808,7 @@ static void Scan_Request( void )
     {
     /* USER CODE BEGIN BLE_SCAN_SUCCESS */
 
+    log_debug("Scan_Request", "START GENERAL DISCOVERY (SCAN)", 0);
     /* USER CODE END BLE_SCAN_SUCCESS */
       APP_DBG_MSG(" \r\n\r** START GENERAL DISCOVERY (SCAN) **  \r\n\r");
     }
@@ -813,6 +816,7 @@ static void Scan_Request( void )
     {
     /* USER CODE BEGIN BLE_SCAN_FAILED */
 
+    log_debug("Scan_Request", "BLE_App_Start_Limited_Disc_Req, Failed", 0);
     /* USER CODE END BLE_SCAN_FAILED */
       APP_DBG_MSG("-- BLE_App_Start_Limited_Disc_Req, Failed \r\n\r");
     }
@@ -827,6 +831,7 @@ static void Connect_Request( void )
 {
   /* USER CODE BEGIN Connect_Request_1 */
 
+  log_debug("Scan_Request", "enter", 0);
   /* USER CODE END Connect_Request_1 */
   tBleStatus result;
 
diff --git a/nucleo-wb55-dongle-ble/STM32_WPAN/App/p2p_client_app.c b/nucleo-wb55-dongle-ble/STM32_WPAN/App/p2p_client_app.c
index d6fb97d..43acef8 100644
--- a/nucleo-wb55-dongle-ble/STM32_WPAN/App/p2p_client_app.c
+++ b/nucleo-wb55-dongle-ble/STM32_WPAN/App/p2p_client_app.c
@@ -32,7 +32,7 @@
 #include "app_ble.h"
 
 /* USER CODE BEGIN Includes */
-
+#include "commands.h"
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/
@@ -178,7 +178,7 @@ void P2PC_APP_Init(void)
 void P2PC_APP_Notification(P2PC_APP_ConnHandle_Not_evt_t *pNotification)
 {
 /* USER CODE BEGIN P2PC_APP_Notification_1 */
-
+  log_debug("P2PC_APP_Notification", "enter", 0);
 /* USER CODE END P2PC_APP_Notification_1 */
   switch(pNotification->P2P_Evt_Opcode)
   {
@@ -230,6 +230,7 @@ static SVCCTL_EvtAckStatus_t Event_Handler(void *Event)
   hci_event_pckt *event_pckt;
   evt_blecore_aci *blecore_evt;
 
+  log_debug("Event_Handler", "enter", 0);
   P2P_Client_App_Notification_evt_t Notification;
 
   return_value = SVCCTL_EvtNotAck;
@@ -514,6 +515,7 @@ static SVCCTL_EvtAckStatus_t Event_Handler(void *Event)
 void Gatt_Notification(P2P_Client_App_Notification_evt_t *pNotification)
 {
 /* USER CODE BEGIN Gatt_Notification_1*/
+  log_debug("Gatt_Notification", "enter", 0);
 
 /* USER CODE END Gatt_Notification_1 */
   switch(pNotification->P2P_Client_Evt_Opcode)