diff --git a/source/Makefile b/source/Makefile
index 5e4cb274..ac990d4f 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -311,9 +311,49 @@ CPUFLAGS= -march=rv32imafc \
 			-mabi=ilp32f \
 			-mcmodel=medany -fsigned-char -fno-builtin -nostartfiles \
 			-DportasmHANDLE_INTERRUPT=FreeRTOS_Interrupt_Handler -DARCH_RISCV -D__RISCV_FEATURE_MVE=0 -DBL702 -DBFLB_USE_ROM_DRIVER=1
-DEV_LDFLAGS=-nostartfiles  -L $(PINECILV2_BLE_CRAPWARE_BLOB_DIR) -L $(PINECILV2_RF_CRAPWARE_BLOB_DIR) -l blecontroller_702_std -l bl702_rf
+DEV_LDFLAGS=-nostartfiles  -L $(PINECILV2_BLE_CRAPWARE_BLOB_DIR) -L $(PINECILV2_RF_CRAPWARE_BLOB_DIR) -l blecontroller_702_m0s1 -l bl702_rf
 DEV_AFLAGS=  
-DEV_GLOBAL_DEFS= -D CONFIG_DISABLE_BT_SMP=1 -DCONFIG_BT_BREDR=1 -DBL_MCU_SDK -DBFLB_BLE -DCFG_BLE_ENABLE -DCFG_BLE -DOPTIMIZE_DATA_EVT_FLOW_FROM_CONTROLLER -DCONFIG_MAX_SCO=1 -DCFG_BLE_TX_BUFF_DATA=1 -DCFG_CON=1 -DDCFG_BLE_TX_BUFF_DATA=1 -DCONFIG_BT_L2CAP_DYNAMIC_CHANNEL -DCONFIG_BT_GATT_CLIENT -DCONFIG_BT_CONN -DCONFIG_BT_GATT_DIS_PNP -DCONFIG_BT_GATT_DIS_SERIAL_NUMBER -DCONFIG_BT_GATT_DIS_FW_REV -DCONFIG_BT_GATT_DIS_HW_REV -DCONFIG_BT_GATT_DIS_SW_REV -DCONFIG_BT_ECC -DCONFIG_BT_GATT_DYNAMIC_DB -DCONFIG_BT_GATT_SERVICE_CHANGED -DCONFIG_BT_KEYS_OVERWRITE_OLDEST -DCONFIG_BT_KEYS_SAVE_AGING_COUNTER_ON_PAIRING -DCONFIG_BT_GAP_PERIPHERAL_PREF_PARAMS -DCONFIG_BT_BONDABLE -DCONFIG_BT_HCI_VS_EVT_USER 
+DEV_GLOBAL_DEFS= -DCFG_FREERTOS \
+-DARCH_RISCV \
+-DBL702 \
+-DCFG_BLE_ENABLE \
+-DBFLB_BLE \
+-DCFG_BLE \
+-DOPTIMIZE_DATA_EVT_FLOW_FROM_CONTROLLER \
+-DBL_MCU_SDK \
+-DCFG_CON=2 \
+-DCFG_BLE_TX_BUFF_DATA=2 \
+-DCONFIG_BT_PERIPHERAL \
+-DCONFIG_BT_L2CAP_DYNAMIC_CHANNEL \
+-DCONFIG_BT_GATT_CLIENT \
+-DCONFIG_BT_CONN \
+-DCONFIG_BT_GATT_DIS_PNP \
+-DCONFIG_BT_GATT_DIS_SERIAL_NUMBER \
+-DCONFIG_BT_GATT_DIS_FW_REV \
+-DCONFIG_BT_GATT_DIS_HW_REV \
+-DCONFIG_BT_GATT_DIS_SW_REV \
+-DCONFIG_BT_ECC \
+-DCONFIG_BT_GATT_DYNAMIC_DB \
+-DCONFIG_BT_GATT_SERVICE_CHANGED \
+-DCONFIG_BT_KEYS_OVERWRITE_OLDEST \
+-DCONFIG_BT_KEYS_SAVE_AGING_COUNTER_ON_PAIRING \
+-DCONFIG_BT_GAP_PERIPHERAL_PREF_PARAMS \
+-DCONFIG_BT_BONDABLE \
+-DCONFIG_BT_HCI_VS_EVT_USER \
+-DCONFIG_BT_ASSERT \
+-DCONFIG_BT_SIGNING \
+-DCONFIG_BT_SETTINGS_CCC_LAZY_LOADING \
+-DCONFIG_BT_SETTINGS_USE_PRINTK \
+-DCFG_BLE_STACK_DBG_PRINT \
+-DportasmHANDLE_INTERRUPT=FreeRTOS_Interrupt_Handler 
+# -DBFLB_USE_HAL_DRIVER
+# -DCONFIG_BT_SMP \
+# -DCFG_SLEEP \
+# -DCONFIG_BT_ALLROLES \
+# -DCONFIG_BT_CENTRAL \
+# -DCONFIG_BT_OBSERVER \
+# -DCONFIG_BT_BROADCASTER \
+# -DBFLB_USE_ROM_DRIVER \
 
 
 #Required to be turned off due to their drivers tripping warnings
@@ -355,7 +395,7 @@ $(shell find $(DEVICE_BSP_DIR) -type d  \( $(EXCLUDED_DIRS) \) -prune -false -o
 $(shell find $(SOURCE_MIDDLEWARES_DIR) -type f -name '*.cpp')
 
 # code optimisation ------------------------------------------------------------
-OPTIM=-Os -foptimize-strlen -faggressive-loop-optimizations -fdevirtualize-at-ltrans -fmerge-all-constants -fshort-wchar -flto -finline-small-functions -finline-functions -findirect-inlining -fdiagnostics-color -ffunction-sections -fdata-sections -fshort-enums -fsingle-precision-constant  -fno-common -fno-math-errno -ffast-math -ffinite-math-only -fno-signed-zeros -fsingle-precision-constant
+OPTIM=-Os -fno-jump-tables -foptimize-strlen -faggressive-loop-optimizations -fdevirtualize-at-ltrans -fmerge-all-constants -fshort-wchar -flto -finline-small-functions -finline-functions -findirect-inlining -fdiagnostics-color -ffunction-sections -fdata-sections -fshort-enums -fsingle-precision-constant  -fno-common -fno-math-errno -ffast-math -ffinite-math-only -fno-signed-zeros -fsingle-precision-constant
 
 # global defines ---------------------------------------------------------------
 GLOBAL_DEFINES += $(DEV_GLOBAL_DEFS) -D USE_RTOS_SYSTICK -D MODEL_$(model) -D VECT_TAB_OFFSET=$(bootldr_size)U -fshort-wchar