diff --git a/src/drv/hasp_drv_ft6336u.cpp b/src/drv/hasp_drv_ft6336u.cpp
index 65eb403a..4884c56c 100644
--- a/src/drv/hasp_drv_ft6336u.cpp
+++ b/src/drv/hasp_drv_ft6336u.cpp
@@ -8,12 +8,14 @@
 
     #define RST_PIN (TOUCH_RST) // -1 if pin is connected to VCC else set pin number
 
-static FT6336U ft6336u(TOUCH_SDA, TOUCH_SCL, TOUCH_RST, TOUCH_IRQ);
+FT6336U * touchpanel;
 
 // Read touch points
 bool IRAM_ATTR FT6336U_getXY(int16_t * touchX, int16_t * touchY, bool debug)
 {
-    FT6336U_TouchPointType tp = ft6336u.scan();
+    FT6336U_TouchPointType tp = touchpanel->scan();
+
+    if(tp.touch_count != 1) return false;
 
     if(debug) {
         char tempString[128];
@@ -22,18 +24,75 @@ bool IRAM_ATTR FT6336U_getXY(int16_t * touchX, int16_t * touchY, bool debug)
         Serial.print(tempString);
     }
 
-    if(tp.touch_count != 1) return false;
+    int i = 0; // tp.tp[0].status == TouchStatusEnum::touch ? 0 : 1;
 
-    int i = tp.tp[0].status == TouchStatusEnum::touch ? 0 : 1;
-
-    *touchX = tp.tp[i].x;
-    *touchY = tp.tp[i].y;
+    *touchX = TFT_WIDTH - tp.tp[i].y;
+    *touchY = tp.tp[i].x;
     return true;
 }
 
+void scan(TwoWire & i2c)
+{
+    byte error, address;
+    int nDevices;
+
+    Serial.println("Scanning...");
+
+    nDevices = 0;
+    for(address = 1; address < 127; address++) {
+        // The i2c_scanner uses the return value of
+        // the Write.endTransmisstion to see if
+        // a device did acknowledge to the address.
+        i2c.beginTransmission(address);
+        error = i2c.endTransmission();
+
+        if(error == 0) {
+            Serial.print("I2C device found at address 0x");
+            if(address < 16) Serial.print("0");
+            Serial.print(address, HEX);
+            Serial.println("  !");
+
+            nDevices++;
+        } else if(error == 4) {
+            Serial.print("Unknown error at address 0x");
+            if(address < 16) Serial.print("0");
+            Serial.println(address, HEX);
+        }
+    }
+    if(nDevices == 0)
+        Serial.println("No I2C devices found\n");
+    else
+        Serial.println("done\n");
+}
+
 void FT6336U_init()
 {
-    ft6336u.begin();
-    Log.trace(TAG_DRVR, F("FT6336U touch driver started"));
+    Log.trace(TAG_DRVR, F("Touch SDA     : %d"), TOUCH_SDA);
+    Log.trace(TAG_DRVR, F("Touch SCL     : %d"), TOUCH_SCL);
+    Log.trace(TAG_DRVR, F("Touch freq.   : %d"), TOUCH_FREQUENCY);
+    Log.trace(TAG_DRVR, F("Touch address : %x"), I2C_ADDR_FT6336U);
+
+    touchpanel = new FT6336U(TOUCH_SDA, TOUCH_SCL, TOUCH_RST, TOUCH_IRQ);
+    touchpanel->begin();
+
+    // From:  M5Core2/src/M5Touch.cpp
+    // By default, the FT6336 will pulse the INT line for every touch
+    // event. But because it shares the Wire1 TwoWire/I2C with other
+    // devices, we cannot easily create an interrupt service routine to
+    // handle these events. So instead, we set the INT wire to polled mode,
+    // so it simply goes low as long as there is at least one valid touch.
+    // touchpanel->writeByte(0xA4, 0x00);
+    Wire1.beginTransmission(I2C_ADDR_FT6336U);
+    Wire1.write(0xA4); // address
+    Wire1.write(0x00); // data
+    Wire1.endTransmission();
+
+    scan(Wire1);
+
+    if(touchpanel->read_chip_id() != 0) {
+        Log.trace(TAG_DRVR, F("FT6336U touch driver started chipid: %d"), touchpanel->read_chip_id());
+    } else {
+        Log.error(TAG_DRVR, F("FT6336U touch driver failed to start"));
+    }
 }
 #endif
\ No newline at end of file