diff --git a/HTML/Assets/Detectors/Lumilo/Critical_Struggle/critical_struggle.js b/HTML/Assets/Detectors/Lumilo/Critical_Struggle/critical_struggle.js
index ecc0eb3..93e15e0 100644
--- a/HTML/Assets/Detectors/Lumilo/Critical_Struggle/critical_struggle.js
+++ b/HTML/Assets/Detectors/Lumilo/Critical_Struggle/critical_struggle.js
@@ -36,8 +36,9 @@ var initTime;
 var elaborationString;
 //
 //[optional] single out TUNABLE PARAMETERS below
-var windowSize = 7;
+var windowSize = 6;
 var threshold = 1;
+var mastery_threshold = 0.85;
 var BKTparams = {p_transit: 0.2, 
 				p_slip: 0.1, 
 				p_guess: 0.2, 
@@ -273,7 +274,7 @@ function detect_wheel_spinning(e, rawSkills, currStepCount){
 	updateSkillLevelsAttempts(e, rawSkills, currStepCount);
 
 	for (var skill in skillLevelsAttempts) {
-		if ((skillLevelsAttempts[skill][0] >= 10) && (skillLevelsAttempts[skill][1] < 0.95)){
+		if ((skillLevelsAttempts[skill][0] >= 10) && (skillLevelsAttempts[skill][1] < mastery_threshold)){
 			console.log("is wheel spinning: " + skill.toString() + " " + skillLevelsAttempts[skill].toString());
 			return true;
 		}
diff --git a/HTML/Assets/Detectors/Lumilo/Idle/idle.js b/HTML/Assets/Detectors/Lumilo/Idle/idle.js
index a589b42..36e1087 100644
--- a/HTML/Assets/Detectors/Lumilo/Idle/idle.js
+++ b/HTML/Assets/Detectors/Lumilo/Idle/idle.js
@@ -26,8 +26,6 @@ var mailer;
 
 
 //declare and/or initialize any other custom global variables for this detector here
-var timerId;
-var timerId2;
 var timerId3;
 var timerId4;
 var timerId5;
@@ -51,8 +49,6 @@ function receive_transaction( e ){
 		detector_output.step_id = e.data.tutor_data.step_id;
 
 		//custom processing (insert code here)
-		clearTimeout(timerId);
-	    clearTimeout(timerId2);
 	    clearTimeout(timerId3);
 	    clearTimeout(timerId4);
 	    clearTimeout(timerId5);
@@ -74,22 +70,6 @@ function receive_transaction( e ){
 		detector_output.transaction_id = e.data.transaction_id;
 
 		//custom processing (insert code here)
-		timerId = setTimeout(function() { 
-	      detector_output.history = e.data.tool_data.tool_event_time
-	      detector_output.value = "1, > 25 s"
-	      detector_output.time = new Date();
-		  mailer.postMessage(detector_output);
-		  postMessage(detector_output);
-		  console.log("output_data = ", detector_output); }, 
-	      25000)
-	    timerId2 = setTimeout(function() { 
-	      detector_output.history = e.data.tool_data.tool_event_time
-	      detector_output.value = "1, > 45 s"
-	      detector_output.time = new Date();
-		  mailer.postMessage(detector_output);
-		  postMessage(detector_output);
-		  console.log("output_data = ", detector_output);  }, 
-	      45000)
 	    timerId3 = setTimeout(function() { 
 	      detector_output.history = e.data.tool_data.tool_event_time
 	      detector_output.value = "1, > 1 min"
@@ -158,22 +138,6 @@ self.onmessage = function ( e ) {
 		console.log("output_data = ", detector_output);
 
 
-		timerId = setTimeout(function() { 
-	      detector_output.history = "onLoad"
-	      detector_output.value = "1, > 25 s"
-	      detector_output.time = new Date();
-		  mailer.postMessage(detector_output);
-		  postMessage(detector_output);
-		  console.log("output_data = ", detector_output); }, 
-	      25000)
-	    timerId2 = setTimeout(function() { 
-	      detector_output.history = "onLoad"
-	      detector_output.value = "1, > 45 s"
-	      detector_output.time = new Date();
-		  mailer.postMessage(detector_output);
-		  postMessage(detector_output);
-		  console.log("output_data = ", detector_output);  }, 
-	      45000)
 	    timerId3 = setTimeout(function() { 
 	      detector_output.history = "onLoad"
 	      detector_output.value = "1, > 1 min"
diff --git a/HTML/Assets/Detectors/Lumilo/Struggle/struggle__moving_average.js b/HTML/Assets/Detectors/Lumilo/Struggle/struggle__moving_average.js
index 61fb620..d447ecb 100644
--- a/HTML/Assets/Detectors/Lumilo/Struggle/struggle__moving_average.js
+++ b/HTML/Assets/Detectors/Lumilo/Struggle/struggle__moving_average.js
@@ -24,8 +24,8 @@ var intervalID;
 
 //declare and/or initialize any other custom global variables for this detector here
 var attemptCorrect;
-var windowSize = 7;
-var threshold = 1;
+var windowSize = 10;
+var threshold = 3;
 var initTime;
 var elaborationString;
 var seedTime = 25;
diff --git a/HTML/Assets/Detectors/Lumilo/Student_Doing_Well/student_doing_well__moving_average.js b/HTML/Assets/Detectors/Lumilo/Student_Doing_Well/student_doing_well__moving_average.js
index f226f22..2870227 100644
--- a/HTML/Assets/Detectors/Lumilo/Student_Doing_Well/student_doing_well__moving_average.js
+++ b/HTML/Assets/Detectors/Lumilo/Student_Doing_Well/student_doing_well__moving_average.js
@@ -22,8 +22,8 @@ var attemptWindow;
 
 //declare and/or initialize any other custom global variables for this detector here
 var attemptCorrect;
-var windowSize = 7;
-var threshold = 6;
+var windowSize = 10;
+var threshold = 8;
 var stepCounter = {};
 
 
diff --git a/HTML/Assets/Detectors/Lumilo/System_Misuse/system_misuse.js b/HTML/Assets/Detectors/Lumilo/System_Misuse/system_misuse.js
index 68f3ff3..0d1f196 100644
--- a/HTML/Assets/Detectors/Lumilo/System_Misuse/system_misuse.js
+++ b/HTML/Assets/Detectors/Lumilo/System_Misuse/system_misuse.js
@@ -35,8 +35,8 @@ var help_variables = {"lastAction": "null",
 var elaborationString;
 //
 //[optional] single out TUNABLE PARAMETERS below
-var windowSize = 7; //arbitrary: need to tune
-var threshold = 1; //arbitrary: need to tune
+var windowSize = 10; //arbitrary: need to tune
+var threshold = 3; //arbitrary: need to tune
 var errorThreshold = 2; //currently somewhat arbitrary
 var newStepThreshold = 1; //currently somewhat arbitrary
 var familiarityThreshold = 0.4;