diff --git a/avr/att84_base.asm b/avr/att84_base.asm
index ef1a4e5..ceb9f8c 100644
--- a/avr/att84_base.asm
+++ b/avr/att84_base.asm
@@ -117,7 +117,7 @@
 ; ---------------------------------------------------------------------------
 ; Reset and interrupt vectors
 ;  rjmp start ; Reset vector
-  rjmp 0xd00 ; Reset vector
+  rjmp main ; Reset vector
   reti ; EXT_INT0
   reti ; PCI0
   reti ; PCI1
@@ -150,11 +150,8 @@ firmwareStart:   .dw 0 ; will be overwritten when flashing
 .org 0xd00
 
 
-; TODO: 
-; - wait for a few seconds for an incoming flash message
-; - if no such message received within that time period try starting the firmware
 main:
-  rjmp main
+  rjmp bootLoader