diff --git a/r2wars/r2wars.py b/r2wars/r2wars.py
index 242304af7e..21c8cf76d7 100644
--- a/r2wars/r2wars.py
+++ b/r2wars/r2wars.py
@@ -7,6 +7,9 @@
 import time
 import random
 
+useCurses = True
+useArch = "x86"
+useBits = "32"
 
 ctr = 0
 uidx = 0
@@ -21,8 +24,8 @@
 maxprogsize = 64
 r2 = r2pipe.open('malloc://%d'%(memsize))
 #r2 = r2pipe.open('/bin/ls')
-r2.cmd("e asm.arch=x86")
-r2.cmd("e asm.bits=32")
+r2.cmd("e asm.arch=%s"%(useArch))
+r2.cmd("e asm.bits=%s"%(useBits))
 r2.cmd("e scr.color=true")
 r2.cmd("aei")
 r2.cmd("aeim")
@@ -223,6 +226,8 @@ def r2wars_curses():
 	r2.cmd("f theend=0")
 
 	print r2.cmd("b %d"%(memsize))
-	r2wars_curses()
-	#r2wars_plain()
+	if useCurses:
+		r2wars_curses()
+	else:
+		r2wars_plain()