diff --git a/Code/main.asm b/Code/main.asm
index 5fddc13..4c82196 100644
--- a/Code/main.asm
+++ b/Code/main.asm
@@ -533,8 +533,10 @@ Conway:
 	jr z, .dead
 .alive
 	; check if there is two or three neighbors
-	bit 1, a
-	ret z
+	cp a, 2
+	ret c
+	cp a, 4
+	ret nc
 	
 .writealive
 	; add mask to result
@@ -752,9 +754,9 @@ BitsSet:
 SECTION "Default Map", ROM0
 DefaultMap:
 	; 20x18 map with a glider on the top left corner
+	db 1, 2, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+	db 9,12, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 	db 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-	db 0, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-	db 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 	db 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 	db 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 	db 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0