diff --git a/Arduino/BTCDieselHeater/.vscode/arduino.json b/Arduino/BTCDieselHeater/.vscode/arduino.json
index 10cccb6..7cc24f2 100644
--- a/Arduino/BTCDieselHeater/.vscode/arduino.json
+++ b/Arduino/BTCDieselHeater/.vscode/arduino.json
@@ -1,6 +1,6 @@
 {
     "board": "esp32:esp32:esp32",
-    "port": "192.168.0.108",
+    "port": "192.168.0.103",
     "sketch": "BTCDieselHeater.ino",
     "output": "..\\build",
     "configuration": "PSRAM=disabled,PartitionScheme=min_spiffs,FlashMode=qio,FlashFreq=80,FlashSize=4M,UploadSpeed=921600,DebugLevel=none"
diff --git a/Arduino/BTCDieselHeater/BTCConfig.h b/Arduino/BTCDieselHeater/BTCConfig.h
index 8d29295..bc3eda5 100644
--- a/Arduino/BTCDieselHeater/BTCConfig.h
+++ b/Arduino/BTCDieselHeater/BTCConfig.h
@@ -11,7 +11,15 @@
 #define USE_BLE_BLUETOOTH      0
 #define USE_CLASSIC_BLUETOOTH  0
 
-#define USE_WIFI 1
+//////////////////////////////////////////////////////////////////////////////
+// Configure WiFi options
+//
+// *** Presently ESP32 Bluetooth and WiFi do not co-exist well (ala don't work!) ***
+//     HC-05 works OK with WiFi
+//
+#define USE_WIFI      1
+#define USE_OTA       1
+#define USE_WEBSERVER 1
 
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Arduino/BTCDieselHeater/BTCDieselHeater.ino b/Arduino/BTCDieselHeater/BTCDieselHeater.ino
index 01c45db..f3ddc4d 100644
--- a/Arduino/BTCDieselHeater/BTCDieselHeater.ino
+++ b/Arduino/BTCDieselHeater/BTCDieselHeater.ino
@@ -172,10 +172,16 @@ void setup() {
   DebugPort.begin(115200);
 
 #if USE_WIFI == 1
+
   initWifi(WiFi_TriggerPin, FAILEDSSID, FAILEDPASSWORD);
+#if USE_OTA == 1
   initOTA();
+#endif // USE_OTA
+#if USE_WEBSERVER == 1
   initWebServer();
-#endif
+#endif // USE_WEBSERVER
+
+#endif // USE_WIFI
 
   pinMode(ListenOnlyPin, INPUT_PULLUP);   // pin to enable passive mode
   pinMode(LED_Pin, OUTPUT);               // On board LED indicator
@@ -229,10 +235,16 @@ void loop()
   unsigned long timenow = millis();
 
 #if USE_WIFI == 1
+
   doWiFiManager();
+#if USE_OTA == 1
   DoOTA();
+#endif // USE_OTA 
+#if USE_WEBSERVER == 1
   doWebServer();
-#endif
+#endif //USE_WEBSERVER
+
+#endif // USE_WIFI
 
   // check for test commands received from PC Over USB
   if(DebugPort.available()) {
diff --git a/Arduino/BTCDieselHeater/BluetoothESP32.cpp b/Arduino/BTCDieselHeater/BluetoothESP32.cpp
index ab62d5a..a4b2fc1 100644
--- a/Arduino/BTCDieselHeater/BluetoothESP32.cpp
+++ b/Arduino/BTCDieselHeater/BluetoothESP32.cpp
@@ -192,6 +192,7 @@ CBluetoothESP32BLE::~CBluetoothESP32BLE()
 void 
 CBluetoothESP32BLE::init()
 {
+  DebugPort.println("Initialising ESP32 BLE");
   // create the BLE device
   BLEDevice::init("DieselHeater");