diff --git a/Makefile b/Makefile
index 871de73..247bd1b 100644
--- a/Makefile
+++ b/Makefile
@@ -12,12 +12,13 @@ VERBOSE   := false
 ARCH      := m1284
 #FREQ     := 18432000UL
 FREQ      := 8000000UL
-MCU       := atmega1284
+MCU       := atmega1284p
 ASP       := usbasp
 CC        := avr-gcc
 LD        := $(CC)
 OBJCOPY   := avr-objcopy
 AVD       := avrdude
+SIM       := simavr
 MKDIR     := mkdir -p
 RMR       := rm -rf
 GIT       := git
@@ -49,8 +50,13 @@ DEPENDS   := $(FILES:%.c=$(TMPDIR)/%.d)
 # AUXILIARY TARGETS (AND FUSE SETTINGS)
 # ==============================================================================
 
-.PHONY: all
-all: flash
+# .PHONY: all
+# all: flash
+
+.PHONY: run
+run: $(TARGET)
+	$(E) "[SIM] $<"
+	$(Q) $(SIM) -m $(MCU) -f $(FREQ) $<
 
 .PHONY: flash
 flash: $(TARGET)
diff --git a/src/main.c b/src/main.c
index ed56b0b..a12020f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -65,8 +65,6 @@ static int Init(void)
 	// - Wrong fuses? Unlikely.
 	// - Bootloader problems?
 
-	return 0;
-
 	// The watchdog timer is clocked from a separate
 	// on-chip oscillator which runs at 1 MHz. Eight
 	// different clock cycle periods can be selected
@@ -242,13 +240,10 @@ int main(void)
 
 	for (;;) {
 		WDT_Reset();
-		Info("UPDATE");
-		continue;
-		// Update();
+		Update();
 		WDT_Reset();
 		Sleep(1000);
 	}
 
-	UNUSED(Update);
 	return 0;
 }