diff --git a/uart/main.cpp b/uart/main.cpp
index ecfbd6c..5e58013 100644
--- a/uart/main.cpp
+++ b/uart/main.cpp
@@ -6,6 +6,8 @@
 
 #include "flash/flash.hpp"
 #include "io/io.hpp"
+
+#define UART0_NO_INT_VECTORS
 #include "uart/uart.hpp"
 
 void newUartUsage()
@@ -42,7 +44,7 @@ void newUartUsage2()
 {
 	using namespace uart;
 
-	Uart<Hardware1<Config<115200>, Driven::BLOCKING>> serial1;
+	Uart<Hardware1<Config<115200>, Driven::INTERRUPT>> serial1;
 
 	auto ramString = "Hello World from RAM. ";
 	auto flashString = F("Hello World from flash\r\n");
@@ -240,16 +242,15 @@ void optimalUartTest()
 int main()
 {
 	sei();
-	optimalUartTest();
 
 	newUartUsage2();
-	// optimalUartTest();
-	// newUartStreamOverloads();
+	optimalUartTest();
+	newUartStreamOverloads();
 
-	// txString(F("\r\n"));
-	// flushTx();
+	txString(F("\r\n"));
+	flushTx();
 
-	// spiTest();
+	spiTest();
 
 	return 0;
 }
diff --git a/uart/uart b/uart/uart
index 16c9015..1bdc06a 160000
--- a/uart/uart
+++ b/uart/uart
@@ -1 +1 @@
-Subproject commit 16c9015f43f5218ce8676098e6de3e16b1a97f9c
+Subproject commit 1bdc06a325a4559ce0fcf101622a009cf03371fb
diff --git a/uart/uart.cppproj b/uart/uart.cppproj
index 4b7de5e..d118b4c 100644
--- a/uart/uart.cppproj
+++ b/uart/uart.cppproj
@@ -221,15 +221,9 @@
     <Compile Include="uart\hardware.hpp">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="uart\hardware0.cpp">
-      <SubType>compile</SubType>
-    </Compile>
     <Compile Include="uart\hardware0.hpp">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="uart\hardware1.cpp">
-      <SubType>compile</SubType>
-    </Compile>
     <Compile Include="uart\hardware1.hpp">
       <SubType>compile</SubType>
     </Compile>