diff --git a/main.cpp b/main.cpp
index bd6eb26..7b3cad2 100644
--- a/main.cpp
+++ b/main.cpp
@@ -22,7 +22,6 @@ char buffer[SNPRINTF_BUFFER_SIZE];
 SVector<Train, 32> trains;
 SVector<Turnout, 32> turnouts;
 SVector<Signal, 32> signals;
-NfcBoard nfcBoard;
 
 bool autoff = true;
 bool powerIsOn = true;
@@ -347,9 +346,9 @@ int main()
 
 	sei();
 
-	Serial serial;
+	Serial* serial = Serial::getInstance();
 
-	serial.write_p(PSTR("TrainController v0.5 starting\n"));
+	serial->write_p(PSTR("TrainController v0.5 starting\n"));
 
 	while(true)
 	{        
@@ -381,7 +380,7 @@ int main()
 				Train::setOutput(Train::OFF);
 			}
 		}
-		serialDispatch(&serial);
+		serialDispatch(serial);
 	}
 	return 0;
 }