diff --git a/components/BTlib/BTlib.c b/components/BTlib/BTlib.c
index 688ad3f..ba3c176 100644
--- a/components/BTlib/BTlib.c
+++ b/components/BTlib/BTlib.c
@@ -95,7 +95,43 @@ static const esp_gatts_attr_db_t gatt_db[ENV_IDX_NB] =
 static char device_name[] = "prout";
 
 void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t* param){
-	
+	switch(event){
+		case ESP_GAP_BLE_ADV_DATA_SET_COMPLETE_EVT:
+			adv_config_done &= (~ADV_CONFIG_FLAG);
+			if(adv_config_done == 0)
+				esp_ble_gap_start_advertising(&adv_params); // TODO : use ble 5.0
+		break;
+		case ESP_GAP_BLE_SCAN_RSP_DATA_SET_COMPLETE_EVT:
+			adv_config_done &= (~SCAN_RSP_CONFIG_FLAG);
+			if(adv_config_done == 0)
+				esp_ble_gap_start_advertising(&adv_params); // TODO : use ble 5.0
+		break;
+		case ESP_GAP_BLE_ADV_START_COMPLETE_EVT:
+			if(param->adv_start_cmpl.status != ESP_BT_STATUS_SUCCESS)
+				ESP_LOGE("bt", "advertising start failed");
+			else
+				ESP_LOGI("bt", "started advertising");
+		break;
+		case ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT:
+			if(param->adv_stop_cmpl.status != ESP_BT_STATUS_SUCCESS)
+				ESP_LOGE("bt", "advertising stop failed");
+			else
+				ESP_LOGI("bt", "stopped advertising");
+		break;
+		case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT:
+			ESP_LOGI("bt", "update connection params status = %d, min_int = %d, max_int = %d,conn_int = %d,latency = %d, timeout = %d",
+                  	param->update_conn_params.status,
+                  	param->update_conn_params.min_int,
+                  	param->update_conn_params.max_int,
+                  	param->update_conn_params.conn_int,
+                  	param->update_conn_params.latency,
+                  	param->update_conn_params.timeout);
+		break;
+		default:
+			ESP_LOGI("bt", "GATTS, non implemented event");
+		break;
+
+	}
 }
 
 void gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t* param){
diff --git a/sdkconfig b/sdkconfig
index d055e17..c7125f3 100644
--- a/sdkconfig
+++ b/sdkconfig
@@ -638,7 +638,7 @@ CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_MAX_DEVICE_NAME_LEN=32
 CONFIG_BT_BLE_RPA_SUPPORTED=y
 CONFIG_BT_BLE_50_FEATURES_SUPPORTED=y
-# CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
+CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
 # end of Bluedroid Options
 # end of Bluetooth