diff --git a/10 - Hold Shift and Check Checkboxes/index-FINISHED.html b/10 - Hold Shift and Check Checkboxes/index-FINISHED.html
index 3ce296cc4b..e347716d57 100644
--- a/10 - Hold Shift and Check Checkboxes/index-FINISHED.html	
+++ b/10 - Hold Shift and Check Checkboxes/index-FINISHED.html	
@@ -106,13 +106,13 @@
 <script>
 const checkboxes = document.querySelectorAll('.inbox input[type="checkbox"]');
 
-let lastChecked;
+let lastChecked = 'none';
 
 function handleCheck(e) {
   // Check if they had the shift key down
   // AND check that they are checking it
   let inBetween = false;
-  if (e.shiftKey && this.checked) {
+  if (e.shiftKey && lastChecked != 'none' && this !== lastChecked) {
     // go ahead and do what we please
     // loop over every single checkbox
     checkboxes.forEach(checkbox => {
@@ -124,11 +124,21 @@
 
       if (inBetween) {
         checkbox.checked = true;
+      }else{
+        if(checkbox !== this && checkbox !== lastChecked){
+          checkbox.checked = false;
+        }
       }
     });
   }
 
-  lastChecked = this;
+  if(e.shiftKey && lastChecked != 'none'){
+    return;
+  }else if(this.checked == true){
+    lastChecked = this;
+  }else{
+    lastChecked = 'none';
+  }
 }
 
 checkboxes.forEach(checkbox => checkbox.addEventListener('click', handleCheck));