diff --git a/server.js b/server.js
index aad25a1..cf9af31 100644
--- a/server.js
+++ b/server.js
@@ -62,32 +62,44 @@ app.post('/off', function (req, res) {
 })
 
 app.post('/toggle', function (req, res) {
-	var relayState;
 	var options = {
 	  pythonOptions: ['-u'],
 	  args: 'get'
 	};
 
 	PythonShell.run('scripts/fanController.py', options, function (err, results) {
-  	if (err) throw err;
-  	if (results[0] == true)
-  		relayState = true;
-  	else
-  		relayState = false;
-	});
+	  	if (err) throw err;
+	  	
+	  	if (results[0] == true) {
+	  		var toggleOptions = {
+	  			pythonOptions: ['-u'],
+	  			args: 'off'
+	  		};
 
-	options = {
-	  pythonOptions: ['-u'],
-	  args: relayState
-	};
+			PythonShell.run('scripts/fanController.py', toggleOptions, function (err, results) {
+			  	if (err) throw err;
+			  	
+			  	if (results[0] == true)
+			  		res.send('off')
+			  	else
+			  		res.send('none')
+			});
+		}
+	  	else {
+	  		var toggleOptions = {
+	  			pythonOptions: ['-u'],
+	  			args: 'on'
+	  		};
 
-	PythonShell.run('scripts/fanController.py', options, function (err, results) {
-  	if (err) throw err;
-  	
-  	if (results[0] == true)
-  		res.send('off')
-  	else
-  		res.send('on')
+			PythonShell.run('scripts/fanController.py', toggleOptions, function (err, results) {
+			  	if (err) throw err;
+			  	
+			  	if (results[0] == true)
+			  		res.send('on')
+			  	else
+			  		res.send('none')
+			});
+		}
 	});
 })