diff --git a/config.py b/config.py
index 24d126f..326cc31 100644
--- a/config.py
+++ b/config.py
@@ -3,5 +3,5 @@
 #from address in mails sent by watchdog
 from_address = '"watchdog.net" <info@watchdog.net>'
 maildir_path = '/home/wathdog/Maildir'
-production_site = False
 send_errors_to = 'bugs@watchdog.net'
+test_email = 'test@watchdog.net' #wyr test emails to go to this
\ No newline at end of file
diff --git a/settings.py b/settings.py
index d1c5dcb..c5e4812 100644
--- a/settings.py
+++ b/settings.py
@@ -6,6 +6,7 @@
 render_plain = web.template.render('templates/') #without base, useful for sending mails
 db = web.database(dbn=os.environ.get('DATABASE_ENGINE', 'postgres'),
                   db=os.environ.get('WATCHDOG_TABLE', 'watchdog_dev'))
+production_mode = os.environ.get('PRODUCTION_MODE', False)
                   
 #@@@@ is temp directory really okay for sessions??                  
 sess_store = tempfile.mkdtemp()             
diff --git a/utils/writerep.py b/utils/writerep.py
index 3e238dd..c9edff4 100644
--- a/utils/writerep.py
+++ b/utils/writerep.py
@@ -12,13 +12,12 @@
 
 import web
 import captchasolver, forms, helpers, auth
-from settings import db, render
+from settings import db, render, production_mode
 from users import fill_user_details, update_user_details
 from wyrutils import * #@@@ put all the list here 
+from config import test_email
 
-PRODUCTION_MODE = False
-TEST_MODE = (not PRODUCTION_MODE) and True
-TEST_EMAIL = 'test@watchdog.net'
+test_mode = (not production_mode)
 
 urls = (
   '', 'redir',
@@ -57,10 +56,10 @@ def writerep_email(pol_email, pol, zipcode, state, prefix, fname, lname,
     name = '%s. %s %s' % (prefix, fname, lname)
     from_addr = '%s <%s>' % (name, email)
   
-    if PRODUCTION_MODE:
+    if production_mode:
         to_addr = pol_email.lstrip('mailto:')
-    elif TEST_MODE:
-        to_addr = TEST_EMAIL
+    elif test_mode:
+        to_addr = test_email
     #@@@@ msg has to be composed    
     web.sendmail(from_addr, to_addr, subject, msg)
     return True        
@@ -318,7 +317,7 @@ def get_from_input(self, key, input=None):
                    return input.get(k)
     def POST(self):
         i = web.input()
-        to_addr = TEST_EMAIL
+        to_addr = test_email
         from_addr = self.get_from_input('email', i) or ''
         subject = self.get_from_input('issue', i) or ''
         msg = self.get_from_input('message', i) or ''
diff --git a/utils/wyrutils.py b/utils/wyrutils.py
index 3f3e513..b61f462 100644
--- a/utils/wyrutils.py
+++ b/utils/wyrutils.py
@@ -126,11 +126,11 @@ def  __getattr__(self, x):
         return getattr(self.f, x)
 
     def production_click(self):
-        from writerep import PRODUCTION_MODE, TEST_MODE
-        if PRODUCTION_MODE:
+        from writerep import production_mode, test_mode
+        if production_mode:
             request = self.f.click()
             response = urlopen(request.get_full_url(), request.get_data())
-        elif TEST_MODE:
+        elif test_mode:
             self.f.action = web.ctx.homedomain + '/writerep/test'
             request = self.f.click() 
             response = urlopen(request.get_full_url(), request.get_data())
diff --git a/webapp.py b/webapp.py
index a37274a..6fdfbaa 100755
--- a/webapp.py
+++ b/webapp.py
@@ -7,7 +7,7 @@
 import blog
 import petition
 import settings
-from settings import db, render
+from settings import db, render, production_mode
 import schema
 import config
 
@@ -338,7 +338,7 @@ def GET(self, path):
         return file('data/' + path).read()
 
 app = web.application(urls, globals())
-if config.production_site:
+if production_mode:
     app.internalerror = web.emailerrors(config.send_errors_to, web.debugerror)
 settings.setup_session(app)