diff --git a/.gitignore b/.gitignore
index df47f73..38e46e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 .tmp/
-*.tap
 *.sna
 *.sld
 *.tzx
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..d140352
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,8 @@
+all: game.tap
+game.tap: pac.bas
+	zmakebas -l -i 1 -s 1 -n pac -o game.tap pac.bas
+
+clean:
+	rm -f *.tap
+
+.PHONY: all clean
\ No newline at end of file
diff --git a/game.tap b/game.tap
new file mode 100644
index 0000000..ed45668
Binary files /dev/null and b/game.tap differ
diff --git a/pac.bas b/pac.bas
index df9666b..42c4e21 100644
--- a/pac.bas
+++ b/pac.bas
@@ -1,16 +1,11 @@
-    FOR i=1 TO 9: PRINT AT i,2;"\{17}\{0}\{16}\{4}..............": NEXT i: LET s$=" "
+    FOR i=1 TO 9: PRINT AT i,2;"\{17}\{0}\{16}\{4}..............": NEXT i: LET p=22562: LET x=1
 @walls:
-    READ a: READ b: DATA 1,8,2,3,2,4,2,6,3,8,4,2,4,4,4,5,4,6,4,8,0,0: LET p=22562
-    IF a THEN PRINT AT a,b;s$;AT a,17-b;s$;AT 10-a,b;s$;AT 10-a,17-b;s$: GOTO @walls
-    LET g=22831: LET x=1: LET z=4: POKE 22689,129: POKE 22704,129: FOR s=1 TO 85
-@loop:
+    READ a: READ b: DEF FN b()=FN a(g,(g-p<0))+FN a(g,-(g-p>0)): DATA 1,8,2,3,2,4,2
+    IF a THEN PRINT AT a,b;" ";AT a,17-b;" ";AT 10-a,b;" ";AT 10-a,17-b;" ": GO TO @walls
+    LET g=22831: LET z=4: POKE 22689,129: POKE 22704,129: FOR s=1 TO 85 STEP 0
     LET k$=INKEY$: LET n=FN a(p,(32*(k$="d"))-(32*(k$="e"))-(k$="o")+(k$="p"))
-    LET b=(b * NOT n) + n: POKE p,0: LET q=PEEK (p+b): LET p=p+b*(q<>56) 
-    LET p=p+(-14*b*(q=129)): LET q=PEEK p: POKE p,54
-    LET j=g-p: LET j=FN a(g,32*(j<-31))+FN a(g,-32*(j>31))
-    IF j=0 THEN LET j=FN a(g,(g-p<0))+FN a(g,-(g-p>0))
-    POKE g,z:LET x=j-(x * NOT j):LET g=g+x: LET z=PEEK g: POKE g,40
-    IF z=54 THEN RUN
-    IF q<>4 THEN GOTO @loop
-    NEXT s: RUN
-    DEF FN a(l,n)=n*(PEEK (l+n)<>56)
\ No newline at end of file
+    LET b=(b*NOT n)+n: POKE p,0: LET q=PEEK (p+b): LET p=p+b*(q<>56): DATA 6,3,8,4,2
+    LET p=p+(-14*b*(q>99)): LET q=PEEK p: POKE p,54: POKE g,z: LET j=g-p: DATA 4,4,4
+    LET j=FN a(g,32*(j<-31))+FN a(g,-32*(j>31)): IF j=0 THEN LET j=FN b(): DATA 5,4
+    LET x=j-(x*NOT j): LET g=g+x: LET z=PEEK g: POKE g,40: IF z=54 OR q=40 THEN RUN
+    LET s=s+1*(q=4): NEXT s: RUN: DEF FN a(l,n)=n*(PEEK (l+n)<>56): DATA 6,4,8,0,0
\ No newline at end of file