diff --git a/bin/upload-to-bootloader.sh b/bin/upload-to-bootloader.sh
index 0dd87ef1d..5ee008057 100755
--- a/bin/upload-to-bootloader.sh
+++ b/bin/upload-to-bootloader.sh
@@ -1,5 +1,8 @@
 set -e
 
-echo "Converting to uf2 for NRF52 Adafruit bootloader"
+echo "building for t-echo"
+pio run --environment t-echo
+
+echo "Converting to uf2 for NRF52 Adafruit bootloader - double tap on the reset button to force bootloader entry"
 bin/uf2conv.py .pio/build/t-echo/firmware.hex -f 0xADA52840
 cp flash.uf2 /media/kevinh/FTH*BOOT/
diff --git a/platformio.ini b/platformio.ini
index 48437c9a0..f58514fef 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -9,14 +9,14 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [platformio]
-default_envs = tbeam
+;default_envs = tbeam
 ;default_envs = tbeam0.7
 ;default_envs = heltec-v2.0
 ;default_envs = tlora-v1
 ;default_envs = tlora_v1_3
 ;default_envs = tlora-v2
 ;default_envs = lora-relay-v1 # nrf board
-;default_envs = t-echo
+default_envs = t-echo
 ;default_envs = nrf52840dk-geeksville
 ;default_envs = native # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here
 ;default_envs = rak4631
@@ -355,14 +355,13 @@ lib_deps =
 extends = nrf52840_base
 board = t-echo
 # add our variants files to the include and src paths
-# define build flags for the TFT_eSPI library
+# define build flags for the TFT_eSPI library - NOTE: WE NOT LONGER USE TFT_eSPI, it was for an earlier version of the TTGO eink screens
+# -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30
 build_flags = ${nrf52_base.build_flags} -Ivariants/t-echo
-  -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30
 src_filter = ${nrf52_base.src_filter} +<../variants/t-echo>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   https://github.com/geeksville/EPD_Libraries.git
-  TFT_eSPI
 ;upload_protocol = fs
 
 ; First prototype eink/nrf52840/sx1262 device (removed from build because didn't ship in quantity)
diff --git a/variants/t-echo/variant.h b/variants/t-echo/variant.h
index 3e2317f73..9c38c99f4 100644
--- a/variants/t-echo/variant.h
+++ b/variants/t-echo/variant.h
@@ -213,7 +213,7 @@ External serial flash WP25R1635FZUIL0
 // FIXME - I think this is actually just the board power enable - it enables power to the CPU also 
 #define PIN_EINK_PWR_ON (0 + 12)
 
-#define HAS_EINK
+#define HAS_EINK2
 
 // No screen wipes on eink
 #define SCREEN_TRANSITION_MSECS 0