diff --git a/variants/ebyte_eora_s3/platformio.ini b/variants/ebyte_eora_s3/platformio.ini
index bdf6bba3d..74a734720 100644
--- a/variants/ebyte_eora_s3/platformio.ini
+++ b/variants/ebyte_eora_s3/platformio.ini
@@ -64,7 +64,7 @@ lib_deps =
 extends = Ebyte_EoRa-S3
 build_flags =
   ${Ebyte_EoRa-S3.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -99,7 +99,7 @@ build_flags =
   ${Ebyte_EoRa-S3.build_flags}
   -I examples/companion_radio/ui-new
   -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
@@ -118,7 +118,7 @@ build_flags =
   ${Ebyte_EoRa-S3.build_flags}
   -I examples/companion_radio/ui-new
   -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
diff --git a/variants/generic_espnow/platformio.ini b/variants/generic_espnow/platformio.ini
index cdeed076a..89f657107 100644
--- a/variants/generic_espnow/platformio.ini
+++ b/variants/generic_espnow/platformio.ini
@@ -26,7 +26,7 @@ build_src_filter = ${esp32_base.build_src_filter}
 extends = Generic_ESPNOW
 build_flags =
   ${Generic_ESPNOW.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=1
 build_src_filter = ${Generic_ESPNOW.build_src_filter}
   +<../examples/simple_secure_chat/main.cpp>
@@ -54,7 +54,7 @@ lib_deps =
 extends = Generic_ESPNOW
 build_flags =
   ${Generic_ESPNOW.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=8
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
diff --git a/variants/heltec_ct62/platformio.ini b/variants/heltec_ct62/platformio.ini
index 1f2e330a3..bd00c5dc7 100644
--- a/variants/heltec_ct62/platformio.ini
+++ b/variants/heltec_ct62/platformio.ini
@@ -97,7 +97,7 @@ build_flags =
   ${Heltec_ct62.build_flags}
 ;  -D ARDUINO_USB_MODE=1
 ;  -D ARDUINO_USB_CDC_ON_BOOT=1
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
 ;  -D MESH_PACKET_LOGGING=1
@@ -115,7 +115,7 @@ build_flags =
   ${Heltec_ct62.build_flags}
 ;  -D ARDUINO_USB_MODE=1
 ;  -D ARDUINO_USB_CDC_ON_BOOT=1
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
   -D BLE_PIN_CODE=123456
diff --git a/variants/heltec_e213/platformio.ini b/variants/heltec_e213/platformio.ini
index caba3a30e..869a21eb5 100644
--- a/variants/heltec_e213/platformio.ini
+++ b/variants/heltec_e213/platformio.ini
@@ -45,7 +45,7 @@ extends = Heltec_E213_base
 build_flags =
   ${Heltec_E213_base.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=E213Display
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
@@ -65,7 +65,7 @@ extends = Heltec_E213_base
 build_flags =
   ${Heltec_E213_base.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=E213Display
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/heltec_e290/platformio.ini b/variants/heltec_e290/platformio.ini
index 0c07c592c..7f76cec8d 100644
--- a/variants/heltec_e290/platformio.ini
+++ b/variants/heltec_e290/platformio.ini
@@ -39,7 +39,7 @@ extends = Heltec_E290_base
 build_flags =
   ${Heltec_E290_base.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=E290Display
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
@@ -59,7 +59,7 @@ extends = Heltec_E290_base
 build_flags =
   ${Heltec_E290_base.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=E290Display
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
diff --git a/variants/heltec_mesh_solar/platformio.ini b/variants/heltec_mesh_solar/platformio.ini
index 7bfbac85a..5c027178b 100644
--- a/variants/heltec_mesh_solar/platformio.ini
+++ b/variants/heltec_mesh_solar/platformio.ini
@@ -61,7 +61,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
 board_upload.maximum_size = 712704
 build_flags =
   ${Heltec_mesh_solar.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
 ;  -D BLE_DEBUG_LOGGING=1
@@ -81,7 +81,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
 board_upload.maximum_size = 712704
 build_flags =
   ${Heltec_mesh_solar.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
 ;  -D BLE_PIN_CODE=123456
 ;  -D BLE_DEBUG_LOGGING=1
diff --git a/variants/heltec_t114/platformio.ini b/variants/heltec_t114/platformio.ini
index 7b6f5ceef..95fbb6600 100644
--- a/variants/heltec_t114/platformio.ini
+++ b/variants/heltec_t114/platformio.ini
@@ -99,7 +99,7 @@ board_upload.maximum_size = 712704
 build_flags =
   ${Heltec_t114.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
 ;  -D BLE_DEBUG_LOGGING=1
@@ -121,7 +121,7 @@ board_upload.maximum_size = 712704
 build_flags =
   ${Heltec_t114.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
 ;  -D BLE_PIN_CODE=123456
 ;  -D BLE_DEBUG_LOGGING=1
@@ -210,7 +210,7 @@ board_upload.maximum_size = 712704
 build_flags =
   ${Heltec_t114_with_display.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D ENV_INCLUDE_GPS=1   ; enable the GPS page in UI
@@ -233,7 +233,7 @@ board_upload.maximum_size = 712704
 build_flags =
   ${Heltec_t114_with_display.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
 ;  -D BLE_PIN_CODE=123456
 ;  -D BLE_DEBUG_LOGGING=1
diff --git a/variants/heltec_t190/platformio.ini b/variants/heltec_t190/platformio.ini
index 8d21c5231..f9060590f 100644
--- a/variants/heltec_t190/platformio.ini
+++ b/variants/heltec_t190/platformio.ini
@@ -52,7 +52,7 @@ extends = Heltec_T190_base
 build_flags =
   ${Heltec_T190_base.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
   -D BLE_DEBUG_LOGGING=1
@@ -70,7 +70,7 @@ extends = Heltec_T190_base
 build_flags =
   ${Heltec_T190_base.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
 build_src_filter = ${Heltec_T190_base.build_src_filter}
diff --git a/variants/heltec_tracker/platformio.ini b/variants/heltec_tracker/platformio.ini
index 797eafdca..35530dfe7 100644
--- a/variants/heltec_tracker/platformio.ini
+++ b/variants/heltec_tracker/platformio.ini
@@ -51,7 +51,7 @@ build_flags =
   -I examples/companion_radio/ui-new
   -D DISPLAY_ROTATION=1
   -D DISPLAY_CLASS=ST7735Display
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456 ; HWT will use display for pin
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/heltec_tracker_v2/platformio.ini b/variants/heltec_tracker_v2/platformio.ini
index 36de671e2..da5e51533 100644
--- a/variants/heltec_tracker_v2/platformio.ini
+++ b/variants/heltec_tracker_v2/platformio.ini
@@ -120,7 +120,7 @@ lib_deps =
 extends = Heltec_tracker_v2
 build_flags =
   ${Heltec_tracker_v2.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -135,7 +135,7 @@ extends = Heltec_tracker_v2
 build_flags =
   ${Heltec_tracker_v2.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=ST7735Display
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
@@ -154,7 +154,7 @@ extends = Heltec_tracker_v2
 build_flags =
   ${Heltec_tracker_v2.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=ST7735Display
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
@@ -179,13 +179,13 @@ extends = Heltec_tracker_v2
 build_flags =
   ${Heltec_tracker_v2.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=ST7735Display
   -D WIFI_DEBUG_LOGGING=1
   -D WIFI_SSID='"myssid"'
   -D WIFI_PWD='"mypwd"'
-  -D OFFLINE_QUEUE_SIZE=256  
+  -D OFFLINE_QUEUE_SIZE=256
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_tracker_v2.build_src_filter}
diff --git a/variants/heltec_v2/platformio.ini b/variants/heltec_v2/platformio.ini
index f8cc93608..a2860efd8 100644
--- a/variants/heltec_v2/platformio.ini
+++ b/variants/heltec_v2/platformio.ini
@@ -3,6 +3,7 @@ extends = esp32_base
 board = heltec_wifi_lora_32_V2   ; heltec_wifi_lora_32_V2
 build_flags =
   ${esp32_base.build_flags}
+  -Os -ffunction-sections -fdata-sections
   -I variants/heltec_v2
   -D HELTEC_LORA_V2
   -D RADIO_CLASS=CustomSX1276
@@ -183,7 +184,7 @@ build_flags =
   -D WIFI_DEBUG_LOGGING=1
   -D WIFI_SSID='"myssid"'
   -D WIFI_PWD='"mypwd"'
-  -D OFFLINE_QUEUE_SIZE=256  
+  -D OFFLINE_QUEUE_SIZE=256
 ; -D MESH_PACKET_LOGGING=1
 ; -D MESH_DEBUG=1
 build_src_filter = ${Heltec_lora32_v2.build_src_filter}
diff --git a/variants/heltec_v3/platformio.ini b/variants/heltec_v3/platformio.ini
index dcb2873c0..7a5d17805 100644
--- a/variants/heltec_v3/platformio.ini
+++ b/variants/heltec_v3/platformio.ini
@@ -125,7 +125,7 @@ lib_deps =
 extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -140,7 +140,7 @@ extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
@@ -159,7 +159,7 @@ extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
@@ -183,7 +183,7 @@ extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
   -D WIFI_DEBUG_LOGGING=1
@@ -305,7 +305,7 @@ lib_deps =
 extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
@@ -337,7 +337,7 @@ lib_deps =
 extends = Heltec_lora32_v3
 build_flags =
   ${Heltec_lora32_v3.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D WIFI_DEBUG_LOGGING=1
   -D WIFI_SSID='"myssid"'
diff --git a/variants/heltec_v4/platformio.ini b/variants/heltec_v4/platformio.ini
index ecfd7889b..557564875 100644
--- a/variants/heltec_v4/platformio.ini
+++ b/variants/heltec_v4/platformio.ini
@@ -112,7 +112,7 @@ lib_deps =
 extends = Heltec_lora32_v4
 build_flags =
   ${Heltec_lora32_v4.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -127,7 +127,7 @@ extends = Heltec_lora32_v4
 build_flags =
   ${Heltec_lora32_v4.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
@@ -146,7 +146,7 @@ extends = Heltec_lora32_v4
 build_flags =
   ${Heltec_lora32_v4.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
@@ -170,7 +170,7 @@ extends = Heltec_lora32_v4
 build_flags =
   ${Heltec_lora32_v4.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
   -D WIFI_DEBUG_LOGGING=1
diff --git a/variants/heltec_wireless_paper/platformio.ini b/variants/heltec_wireless_paper/platformio.ini
index 9cf761537..57c585f99 100644
--- a/variants/heltec_wireless_paper/platformio.ini
+++ b/variants/heltec_wireless_paper/platformio.ini
@@ -46,7 +46,7 @@ extends = Heltec_Wireless_Paper_base
 build_flags =
   ${Heltec_Wireless_Paper_base.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=E213Display
   -D BLE_PIN_CODE=123456   ; dynamic, random PIN
diff --git a/variants/ikoka_handheld_nrf/platformio.ini b/variants/ikoka_handheld_nrf/platformio.ini
index e4643c383..8f7048f4b 100644
--- a/variants/ikoka_handheld_nrf/platformio.ini
+++ b/variants/ikoka_handheld_nrf/platformio.ini
@@ -2,7 +2,7 @@
 extends = Xiao_nrf52
 lib_deps = ${nrf52_base.lib_deps}
   ${sensor_base.lib_deps}
-  densaugeo/base64 @ ~1.4.0  
+  densaugeo/base64 @ ~1.4.0
 build_flags = ${nrf52_base.build_flags}
   ${sensor_base.build_flags}
   -I lib/nrf52/s140_nrf52_7.3.0_API/include
@@ -37,7 +37,7 @@ build_flags = ${ikoka_nrf52.build_flags}
   -D PIN_WIRE_SCL=D6
   -D PIN_WIRE_SDA=D7
   -D PIN_USER_BTN=D0
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
   -D QSPIFLASH=1
@@ -60,7 +60,7 @@ extends = ikoka_nrf52
 build_flags = ${ikoka_nrf52_ssd1306_companion.build_flags}
   -D BLE_PIN_CODE=123456
   -D LORA_TX_POWER=20
-  -D DISPLAY_ROTATION=2    
+  -D DISPLAY_ROTATION=2
 build_src_filter = ${ikoka_nrf52_ssd1306_companion.build_src_filter}
   +<helpers/nrf52/SerialBLEInterface.cpp>
 
@@ -86,7 +86,7 @@ build_flags =
   -D ADVERT_LON=0.0
   -D ADMIN_PASSWORD='"password"'
   -D MAX_NEIGHBOURS=50
-  -D LORA_TX_POWER=20  
+  -D LORA_TX_POWER=20
 build_src_filter = ${ikoka_nrf52.build_src_filter}
   +<../examples/simple_repeater/*.cpp>
 
@@ -98,6 +98,6 @@ build_flags =
   -D ADVERT_LAT=0.0
   -D ADVERT_LON=0.0
   -D ADMIN_PASSWORD='"password"'
-  -D LORA_TX_POWER=20  
+  -D LORA_TX_POWER=20
 build_src_filter = ${ikoka_nrf52.build_src_filter}
   +<../examples/simple_room_server/*.cpp>
diff --git a/variants/ikoka_nano_nrf/platformio.ini b/variants/ikoka_nano_nrf/platformio.ini
index abfbcf670..2b59aca6d 100644
--- a/variants/ikoka_nano_nrf/platformio.ini
+++ b/variants/ikoka_nano_nrf/platformio.ini
@@ -107,7 +107,7 @@ board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags =
   ${ikoka_nano_nrf_baseboard.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D OFFLINE_QUEUE_SIZE=256
@@ -129,7 +129,7 @@ board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags =
   ${ikoka_nano_nrf_baseboard.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -I examples/companion_radio/ui-new
 ;  -D MESH_PACKET_LOGGING=1
diff --git a/variants/ikoka_stick_nrf/platformio.ini b/variants/ikoka_stick_nrf/platformio.ini
index 9ced2bbb5..6ac8792a3 100644
--- a/variants/ikoka_stick_nrf/platformio.ini
+++ b/variants/ikoka_stick_nrf/platformio.ini
@@ -108,7 +108,7 @@ board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags =
   ${ikoka_stick_nrf_baseboard.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D OFFLINE_QUEUE_SIZE=256
@@ -130,7 +130,7 @@ board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags =
   ${ikoka_stick_nrf_baseboard.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -I examples/companion_radio/ui-new
 ;  -D MESH_PACKET_LOGGING=1
diff --git a/variants/keepteen_lt1/platformio.ini b/variants/keepteen_lt1/platformio.ini
index cb3ea9c88..841455564 100644
--- a/variants/keepteen_lt1/platformio.ini
+++ b/variants/keepteen_lt1/platformio.ini
@@ -62,7 +62,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
 board_upload.maximum_size = 712704
 build_flags = ${KeepteenLT1.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
@@ -82,7 +82,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
 board_upload.maximum_size = 712704
 build_flags = ${KeepteenLT1.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
diff --git a/variants/lilygo_t3s3/platformio.ini b/variants/lilygo_t3s3/platformio.ini
index 0f01c9b76..a7b4de988 100644
--- a/variants/lilygo_t3s3/platformio.ini
+++ b/variants/lilygo_t3s3/platformio.ini
@@ -102,7 +102,7 @@ lib_deps =
 extends = LilyGo_T3S3_sx1262
 build_flags =
   ${LilyGo_T3S3_sx1262.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -137,7 +137,7 @@ build_flags =
   ${LilyGo_T3S3_sx1262.build_flags}
   -I examples/companion_radio/ui-new
   -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
@@ -156,7 +156,7 @@ build_flags =
   ${LilyGo_T3S3_sx1262.build_flags}
   -I examples/companion_radio/ui-new
   -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
diff --git a/variants/lilygo_t3s3_sx1276/platformio.ini b/variants/lilygo_t3s3_sx1276/platformio.ini
index f544be113..d2c57644e 100644
--- a/variants/lilygo_t3s3_sx1276/platformio.ini
+++ b/variants/lilygo_t3s3_sx1276/platformio.ini
@@ -100,7 +100,7 @@ lib_deps =
 extends = LilyGo_T3S3_sx1276
 build_flags =
   ${LilyGo_T3S3_sx1276.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -136,7 +136,7 @@ build_flags =
   ${LilyGo_T3S3_sx1276.build_flags}
   -I examples/companion_radio/ui-new
   -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D MESH_PACKET_LOGGING=1
   -D MESH_DEBUG=1
@@ -155,7 +155,7 @@ build_flags =
   ${LilyGo_T3S3_sx1276.build_flags}
   -I examples/companion_radio/ui-new
   -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
diff --git a/variants/lilygo_tbeam_SX1262/platformio.ini b/variants/lilygo_tbeam_SX1262/platformio.ini
index 9fb4805fc..44c1731a4 100644
--- a/variants/lilygo_tbeam_SX1262/platformio.ini
+++ b/variants/lilygo_tbeam_SX1262/platformio.ini
@@ -3,6 +3,7 @@ extends = esp32_base
 board = ttgo-t-beam
 build_flags =
   ${esp32_base.build_flags}
+  -Os -ffunction-sections -fdata-sections
   -I variants/lilygo_tbeam_SX1262
   -D TBEAM_SX1262
   -D SX126X_DIO2_AS_RF_SWITCH=true
diff --git a/variants/lilygo_tbeam_SX1276/platformio.ini b/variants/lilygo_tbeam_SX1276/platformio.ini
index 3562c40e9..6937ebc6c 100644
--- a/variants/lilygo_tbeam_SX1276/platformio.ini
+++ b/variants/lilygo_tbeam_SX1276/platformio.ini
@@ -3,6 +3,7 @@ extends = esp32_base
 board = ttgo-t-beam
 build_flags =
   ${esp32_base.build_flags}
+  -Os -ffunction-sections -fdata-sections
   -I variants/lilygo_tbeam_SX1276
   -D TBEAM_SX1276
   -D SX127X_CURRENT_LIMIT=120
diff --git a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
index 2d2a095aa..a88f4ed84 100644
--- a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
+++ b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
@@ -116,7 +116,7 @@ extends = T_Beam_S3_Supreme_SX1262
 build_flags =
   ${T_Beam_S3_Supreme_SX1262.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/lilygo_tdeck/platformio.ini b/variants/lilygo_tdeck/platformio.ini
index 807663f8f..4445c1419 100644
--- a/variants/lilygo_tdeck/platformio.ini
+++ b/variants/lilygo_tdeck/platformio.ini
@@ -66,7 +66,7 @@ extends = LilyGo_TDeck
 build_flags =
   ${LilyGo_TDeck.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
 build_src_filter = ${LilyGo_TDeck.build_src_filter}
@@ -84,7 +84,7 @@ extends = LilyGo_TDeck
 build_flags =
   ${LilyGo_TDeck.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/lilygo_techo/platformio.ini b/variants/lilygo_techo/platformio.ini
index e2172b1da..2b0cdb5c9 100644
--- a/variants/lilygo_techo/platformio.ini
+++ b/variants/lilygo_techo/platformio.ini
@@ -85,7 +85,7 @@ build_flags =
   ${LilyGo_T-Echo.build_flags}
   -I src/helpers/ui
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D QSPIFLASH=1
   -D BLE_PIN_CODE=123456
@@ -113,7 +113,7 @@ build_flags =
   ${LilyGo_T-Echo.build_flags}
   -I src/helpers/ui
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
   -D UI_RECENT_LIST_SIZE=9
diff --git a/variants/lilygo_techo_lite/platformio.ini b/variants/lilygo_techo_lite/platformio.ini
index 0ba6a1970..5f3073672 100644
--- a/variants/lilygo_techo_lite/platformio.ini
+++ b/variants/lilygo_techo_lite/platformio.ini
@@ -78,7 +78,7 @@ build_flags =
   ${LilyGo_T-Echo-Lite.build_flags}
   -I src/helpers/ui
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   ; -D QSPIFLASH=1
   -D BLE_PIN_CODE=123456
diff --git a/variants/lilygo_tlora_c6/platformio.ini b/variants/lilygo_tlora_c6/platformio.ini
index b29cd0360..8cf05b19b 100644
--- a/variants/lilygo_tlora_c6/platformio.ini
+++ b/variants/lilygo_tlora_c6/platformio.ini
@@ -67,7 +67,7 @@ lib_deps =
 [env:LilyGo_Tlora_C6_companion_radio_ble_]
 extends = tlora_c6
 build_flags = ${tlora_c6.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
diff --git a/variants/lilygo_tlora_v2_1/platformio.ini b/variants/lilygo_tlora_v2_1/platformio.ini
index f27f57fd9..6903ccd94 100644
--- a/variants/lilygo_tlora_v2_1/platformio.ini
+++ b/variants/lilygo_tlora_v2_1/platformio.ini
@@ -6,8 +6,6 @@ build_type = release  ; Set build type to release
 board_build.partitions = min_spiffs.csv ; get around 4mb flash limit
 build_flags =
   ${esp32_base.build_flags}
-  ${sensor_base.build_flags}
-  -UENV_INCLUDE_GPS
   -I variants/lilygo_tlora_v2_1
   -Os -ffunction-sections -fdata-sections  ; Optimize for size
   -D LILYGO_TLORA  ; LILYGO T-LoRa V2.1-1.6 ESP32 with SX1276
@@ -35,7 +33,7 @@ build_src_filter = ${esp32_base.build_src_filter}
   +<helpers/sensors>
 lib_deps =
   ${esp32_base.lib_deps}
-  ${sensor_base.lib_deps}
+  adafruit/Adafruit SSD1306 @ ^2.5.13
 
 ; === LILYGO T-LoRa V2.1-1.6 with SX1276 environments ===
 [env:LilyGo_TLora_V2_1_1_6_repeater]
@@ -136,7 +134,7 @@ build_flags =
   -D WIFI_SSID='"ssid"'
   -D WIFI_PWD='"password"'
   -D WIFI_DEBUG_LOGGING=1
-  -D OFFLINE_QUEUE_SIZE=256  
+  -D OFFLINE_QUEUE_SIZE=256
 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter}
   +<helpers/esp32/*.cpp>
   +<helpers/ui/MomentaryButton.cpp>
diff --git a/variants/mesh_pocket/platformio.ini b/variants/mesh_pocket/platformio.ini
index 015c2ca4b..eb0313f21 100644
--- a/variants/mesh_pocket/platformio.ini
+++ b/variants/mesh_pocket/platformio.ini
@@ -72,7 +72,7 @@ board_upload.maximum_size = 712704
 build_flags =
   ${Mesh_pocket.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D OFFLINE_QUEUE_SIZE=256
@@ -96,7 +96,7 @@ board_upload.maximum_size = 712704
 build_flags =
   ${Mesh_pocket.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D AUTO_OFF_MILLIS=0
 ;  -D BLE_PIN_CODE=123456
diff --git a/variants/nano_g2_ultra/platformio.ini b/variants/nano_g2_ultra/platformio.ini
index 116a1f259..6f5a7a90e 100644
--- a/variants/nano_g2_ultra/platformio.ini
+++ b/variants/nano_g2_ultra/platformio.ini
@@ -37,7 +37,7 @@ build_flags =
   ${Nano_G2_Ultra.build_flags}
   -I src/helpers/ui
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
 ;  -D BLE_DEBUG_LOGGING=0
@@ -70,7 +70,7 @@ build_flags =
   ${Nano_G2_Ultra.build_flags}
   -I src/helpers/ui
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D QSPIFLASH=1
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/promicro/platformio.ini b/variants/promicro/platformio.ini
index 15bb5ce67..a69ab5ffb 100644
--- a/variants/promicro/platformio.ini
+++ b/variants/promicro/platformio.ini
@@ -115,7 +115,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
 board_upload.maximum_size = 712704
 build_flags = ${Promicro.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
@@ -135,7 +135,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
 board_upload.maximum_size = 712704
 build_flags = ${Promicro.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini
index 7293b4d49..6fd169b36 100644
--- a/variants/rak4631/platformio.ini
+++ b/variants/rak4631/platformio.ini
@@ -117,7 +117,7 @@ build_flags =
   -D PIN_USER_BTN=9
   -D PIN_USER_BTN_ANA=31
   -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
@@ -138,7 +138,7 @@ build_flags =
   -D PIN_USER_BTN=9
   -D PIN_USER_BTN_ANA=31
   -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
diff --git a/variants/rak_wismesh_tag/platformio.ini b/variants/rak_wismesh_tag/platformio.ini
index 081cb0d07..ad97c9b0b 100644
--- a/variants/rak_wismesh_tag/platformio.ini
+++ b/variants/rak_wismesh_tag/platformio.ini
@@ -69,7 +69,7 @@ board_upload.maximum_size = 712704
 build_flags =
   ${rak_wismesh_tag.build_flags}
   -I examples/companion_radio/ui-orig
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
@@ -89,7 +89,7 @@ board_upload.maximum_size = 712704
 build_flags =
   ${rak_wismesh_tag.build_flags}
   -I examples/companion_radio/ui-orig
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
diff --git a/variants/sensecap_indicator-espnow/platformio.ini b/variants/sensecap_indicator-espnow/platformio.ini
index e643d0339..d0e3f3084 100644
--- a/variants/sensecap_indicator-espnow/platformio.ini
+++ b/variants/sensecap_indicator-espnow/platformio.ini
@@ -37,7 +37,7 @@ extends =SenseCapIndicator-ESPNow
 build_flags =
   ${SenseCapIndicator-ESPNow.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
diff --git a/variants/sensecap_solar/platformio.ini b/variants/sensecap_solar/platformio.ini
index d4fb7b442..ca4bb00d3 100644
--- a/variants/sensecap_solar/platformio.ini
+++ b/variants/sensecap_solar/platformio.ini
@@ -67,7 +67,7 @@ board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags =
   ${SenseCap_Solar.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D OFFLINE_QUEUE_SIZE=256
@@ -87,7 +87,7 @@ board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags =
   ${SenseCap_Solar.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
diff --git a/variants/station_g2/platformio.ini b/variants/station_g2/platformio.ini
index 1428221d0..a507db516 100644
--- a/variants/station_g2/platformio.ini
+++ b/variants/station_g2/platformio.ini
@@ -184,7 +184,7 @@ extends = Station_G2
 build_flags =
   ${Station_G2.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
@@ -201,7 +201,7 @@ extends = Station_G2
 build_flags =
   ${Station_G2.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
@@ -221,12 +221,12 @@ extends = Station_G2
 build_flags =
   ${Station_G2.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D WIFI_DEBUG_LOGGING=1
   -D WIFI_SSID='"myssid"'
   -D WIFI_PWD='"mypwd"'
-  -D OFFLINE_QUEUE_SIZE=256  
+  -D OFFLINE_QUEUE_SIZE=256
 ; -D MESH_PACKET_LOGGING=1
 ; -D MESH_DEBUG=1
 build_src_filter = ${Station_G2.build_src_filter}
diff --git a/variants/t1000-e/platformio.ini b/variants/t1000-e/platformio.ini
index 555b182fb..31f562804 100644
--- a/variants/t1000-e/platformio.ini
+++ b/variants/t1000-e/platformio.ini
@@ -73,7 +73,7 @@ board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags = ${t1000-e.build_flags}
   -I examples/companion_radio/ui-orig
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -96,7 +96,7 @@ board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags = ${t1000-e.build_flags}
   -I examples/companion_radio/ui-orig
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_TX_POWER=0
diff --git a/variants/thinknode_m2/platformio.ini b/variants/thinknode_m2/platformio.ini
index b2ebca732..e7fee2c89 100644
--- a/variants/thinknode_m2/platformio.ini
+++ b/variants/thinknode_m2/platformio.ini
@@ -118,7 +118,7 @@ lib_deps =
 extends = ThinkNode_M2
 build_flags =
   ${ThinkNode_M2.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -133,7 +133,7 @@ extends = ThinkNode_M2
 build_flags =
   ${ThinkNode_M2.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D OFFLINE_QUEUE_SIZE=256
@@ -155,7 +155,7 @@ extends = ThinkNode_M2
 build_flags =
   ${ThinkNode_M2.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
 build_src_filter = ${ThinkNode_M2.build_src_filter}
@@ -173,7 +173,7 @@ extends = ThinkNode_M2
 build_flags =
   ${ThinkNode_M2.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
   -D WIFI_DEBUG_LOGGING=1
@@ -194,7 +194,7 @@ extends = ThinkNode_M2
 build_flags =
   ${ThinkNode_M2.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D SERIAL_TX=D6
   -D SERIAL_RX=D7
diff --git a/variants/thinknode_m3/platformio.ini b/variants/thinknode_m3/platformio.ini
index 8ef2ba54a..2dad358d7 100644
--- a/variants/thinknode_m3/platformio.ini
+++ b/variants/thinknode_m3/platformio.ini
@@ -18,11 +18,11 @@ build_flags = ${nrf52_base.build_flags}
   -D RF_SWITCH_TABLE
   -D RX_BOOSTED_GAIN=true
   -D P_LORA_BUSY=43
-  -D P_LORA_SCLK=45 
+  -D P_LORA_SCLK=45
   -D P_LORA_NSS=44
   -D P_LORA_DIO_1=40
   -D P_LORA_MISO=47
-  -D P_LORA_MOSI=46 
+  -D P_LORA_MOSI=46
   -D P_LORA_RESET=42
   -D P_LORA_TX_LED=PIN_LED_BLUE
   -D P_LORA_TX_LED_ON=LOW
@@ -77,7 +77,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags = ${ThinkNode_M3.build_flags}
   -I examples/companion_radio/ui-orig
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -100,7 +100,7 @@ board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags = ${ThinkNode_M3.build_flags}
   -I examples/companion_radio/ui-orig
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_TX_POWER=0
diff --git a/variants/thinknode_m5/platformio.ini b/variants/thinknode_m5/platformio.ini
index fb2ba3ac2..4ee73d8cf 100644
--- a/variants/thinknode_m5/platformio.ini
+++ b/variants/thinknode_m5/platformio.ini
@@ -130,7 +130,7 @@ lib_deps =
 extends = ThinkNode_M5
 build_flags =
   ${ThinkNode_M5.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -145,7 +145,7 @@ extends = ThinkNode_M5
 build_flags =
   ${ThinkNode_M5.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D OFFLINE_QUEUE_SIZE=256
@@ -169,7 +169,7 @@ extends = ThinkNode_M5
 build_flags =
   ${ThinkNode_M5.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
 build_src_filter = ${ThinkNode_M5.build_src_filter}
@@ -188,7 +188,7 @@ extends = ThinkNode_M5
 build_flags =
   ${ThinkNode_M5.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
   -D WIFI_DEBUG_LOGGING=1
@@ -210,7 +210,7 @@ extends = ThinkNode_M5
 build_flags =
   ${ThinkNode_M5.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D SERIAL_TX=D6
   -D SERIAL_RX=D7
diff --git a/variants/thinknode_m6/platformio.ini b/variants/thinknode_m6/platformio.ini
index db22073c0..80b55c7ce 100644
--- a/variants/thinknode_m6/platformio.ini
+++ b/variants/thinknode_m6/platformio.ini
@@ -77,7 +77,7 @@ build_flags =
   ${ThinkNode_M6.build_flags}
   -I src/helpers/ui
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
@@ -103,7 +103,7 @@ build_flags =
   ${ThinkNode_M6.build_flags}
   -I src/helpers/ui
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D QSPIFLASH=1
   -D OFFLINE_QUEUE_SIZE=256
diff --git a/variants/wio-tracker-l1-eink/platformio.ini b/variants/wio-tracker-l1-eink/platformio.ini
index deb85f5e7..63303c5fa 100644
--- a/variants/wio-tracker-l1-eink/platformio.ini
+++ b/variants/wio-tracker-l1-eink/platformio.ini
@@ -43,7 +43,7 @@ board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags = ${WioTrackerL1Eink.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
diff --git a/variants/wio-tracker-l1/platformio.ini b/variants/wio-tracker-l1/platformio.ini
index 31c6bcb07..8d8a68f27 100644
--- a/variants/wio-tracker-l1/platformio.ini
+++ b/variants/wio-tracker-l1/platformio.ini
@@ -60,7 +60,7 @@ board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags = ${WioTrackerL1.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SH1106Display
   -D UI_HAS_JOYSTICK=1
@@ -86,7 +86,7 @@ board_build.ldscript = boards/nrf52840_s140_v7_extrafs.ld
 board_upload.maximum_size = 708608
 build_flags = ${WioTrackerL1.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
diff --git a/variants/xiao_c3/platformio.ini b/variants/xiao_c3/platformio.ini
index 76b72174a..62a6a8a62 100644
--- a/variants/xiao_c3/platformio.ini
+++ b/variants/xiao_c3/platformio.ini
@@ -73,7 +73,7 @@ build_src_filter = ${Xiao_esp32_C3.build_src_filter}
   +<helpers/esp32/*.cpp>
 build_flags =
   ${Xiao_esp32_C3.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D OFFLINE_QUEUE_SIZE=256
@@ -92,7 +92,7 @@ build_src_filter = ${Xiao_esp32_C3.build_src_filter}
   +<helpers/esp32/*.cpp>
 build_flags =
   ${Xiao_esp32_C3.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
   ; -D BLE_DEBUG_LOGGING=1
@@ -110,7 +110,7 @@ build_src_filter = ${Xiao_esp32_C3.build_src_filter}
   +<helpers/esp32/*.cpp>
 build_flags =
   ${Xiao_esp32_C3.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
   -D WIFI_DEBUG_LOGGING=1
diff --git a/variants/xiao_c6/platformio.ini b/variants/xiao_c6/platformio.ini
index 8f02dc870..0a54902ec 100644
--- a/variants/xiao_c6/platformio.ini
+++ b/variants/xiao_c6/platformio.ini
@@ -50,7 +50,7 @@ lib_deps =
 [env:Xiao_C6_companion_radio_ble_]
 extends = Xiao_C6
 build_flags = ${Xiao_C6.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
@@ -107,7 +107,7 @@ lib_deps =
 [env:Meshimi_companion_radio_ble_]
 extends = Meshimi
 build_flags = ${Meshimi.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
@@ -167,7 +167,7 @@ lib_deps =
 [env:WHY2025_badge_companion_radio_ble_]
 extends = WHY2025_badge
 build_flags = ${WHY2025_badge.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D BLE_DEBUG_LOGGING=1
diff --git a/variants/xiao_nrf52/platformio.ini b/variants/xiao_nrf52/platformio.ini
index edbf6275e..2a710e73e 100644
--- a/variants/xiao_nrf52/platformio.ini
+++ b/variants/xiao_nrf52/platformio.ini
@@ -45,7 +45,7 @@ board_upload.maximum_size = 708608
 build_flags =
   ${Xiao_nrf52.build_flags}
   -I examples/companion_radio/ui-orig
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D OFFLINE_QUEUE_SIZE=256
@@ -68,7 +68,7 @@ board_upload.maximum_size = 708608
 build_flags =
   ${Xiao_nrf52.build_flags}
   -I examples/companion_radio/ui-orig
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D QSPIFLASH=1
 ;  -D MESH_PACKET_LOGGING=1
diff --git a/variants/xiao_s3_wio/platformio.ini b/variants/xiao_s3_wio/platformio.ini
index 22bb4090a..664670557 100644
--- a/variants/xiao_s3_wio/platformio.ini
+++ b/variants/xiao_s3_wio/platformio.ini
@@ -116,7 +116,7 @@ lib_deps =
 extends = Xiao_S3_WIO
 build_flags =
   ${Xiao_S3_WIO.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -131,7 +131,7 @@ extends = Xiao_S3_WIO
 build_flags =
   ${Xiao_S3_WIO.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
   -D OFFLINE_QUEUE_SIZE=256
@@ -153,7 +153,7 @@ extends = Xiao_S3_WIO
 build_flags =
   ${Xiao_S3_WIO.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D BLE_PIN_CODE=123456
   -D DISPLAY_CLASS=SSD1306Display
@@ -177,7 +177,7 @@ extends = Xiao_S3_WIO
 build_flags =
   ${Xiao_S3_WIO.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D DISPLAY_CLASS=SSD1306Display
   -D SERIAL_TX=D6
@@ -205,7 +205,7 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter}
 build_flags =
   ${Xiao_S3_WIO.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=700
   -D MAX_GROUP_CHANNELS=40
   -D OFFLINE_QUEUE_SIZE=256
   -D WIFI_DEBUG_LOGGING=1