diff --git a/rowers/templates/embedded_video.html b/rowers/templates/embedded_video.html
index d03c5e78..8fc5e384 100644
--- a/rowers/templates/embedded_video.html
+++ b/rowers/templates/embedded_video.html
@@ -157,40 +157,14 @@
         if(player && player.getCurrentTime) {
           videotime = player.getCurrentTime();
           var delay = document.getElementById("id_delay").value;
-          sliderpos = Math.round(videotime) + Math.round(delay);
-          slider.value = sliderpos;
+          if (lock.checked) {
+            sliderpos = Math.round(videotime) + Math.round(delay);
+            slider.value = sliderpos;
+        }
 
-          var datatime = parseFloat(videotime)+parseFloat(delay);
-          // velo = boatspeed[Math.round(datatime)];
-          lat = latitude[Math.round(datatime)];
-          lon = longitude[Math.round(datatime)];
-          // strokerate = spm[Math.round(datatime)];
-          // catchangle = ctch[Math.round(datatime)];
-          {% for id, metric in metrics.items %}
-          {{ id }}_now = {{ id }}_values[Math.round(datatime)];
-          // console.log(datatime,{{ id }}_now, "{{ metric.name }}")
-          {% endfor %}
 
-          document.getElementById("time").innerHTML = Math.round(videotime);
-          document.getElementById("datatime").innerHTML = Math.round(datatime);
-          // document.getElementById("speed").innerHTML = velo;
-          // document.getElementById("spm").innerHTML = strokerate;
-          // document.getElementById("catch").innerHTML = catchangle;
-          {% for id, metric in metrics.items %}
-          document.getElementById("{{ id }}").innerHTML = {{ id }}_now;
-          document.getElementById("{{ id }}").className = 'bold';
-          {% endfor %}
-          {% for group in metricsgroups %}
-          try {
-            set_{{ group }}();
-          } catch (e) {}
-          {% endfor %}
           // gauge.set(catch_now);
-          try {
-            var newLatLng = new L.LatLng(lat, lon);
-            // console.log(newLatLng);
-            marker.setLatLng(newLatLng);
-          } catch (e) {}
+
         }
         if(videotime !== oldTime) {
           onProgress(videotime);
@@ -221,7 +195,6 @@
           playing = true;
         }
       }
-
     </script>
   </li>
   {% if user.is_authenticated and user == workout.user.user %}
@@ -296,7 +269,7 @@
   lock.checked = true;
   output.disabled = true;
   {% endif %}
-
+  var delay = output.value;
 
   // slider
   var slider = document.getElementById("myRange");
@@ -308,9 +281,11 @@
   var output = document.getElementById("id_delay");
   try {
     output.value = Math.round(slider.value)-Math.round(player.getCurrentTime()); // Display the default slider value
+    delay = Math.round(slider.value)-Math.round(player.getCurrentTime());
   }
   catch(err) {
     output.value = Math.round(slider.value);
+    delay = Math.round(slider.value);
   }
   // Update the current slider value (each time you drag the slider handle)
   slider.oninput = function() {
@@ -329,10 +304,46 @@
         }
       }
     } else {
-      // console.log('changing');
+      console.log('changing, not checked');
       output.value = this.value-Math.round(player.getCurrentTime());
     }
-    timeupdater = setInterval(updateTime, 1000)
+    var datatime = this.value
+    var videotime = Math.round(player.getCurrentTime());
+    //
+    // Setting Data
+    // velo = boatspeed[Math.round(datatime)];
+    lat = latitude[Math.round(datatime)];
+    lon = longitude[Math.round(datatime)];
+    // strokerate = spm[Math.round(datatime)];
+    // catchangle = ctch[Math.round(datatime)];
+    {% for id, metric in metrics.items %}
+    {{ id }}_now = {{ id }}_values[Math.round(datatime)];
+    // console.log(datatime,{{ id }}_now, "{{ metric.name }}")
+    {% endfor %}
+
+    document.getElementById("time").innerHTML = Math.round(videotime);
+    document.getElementById("datatime").innerHTML = Math.round(datatime);
+    // document.getElementById("speed").innerHTML = velo;
+    // document.getElementById("spm").innerHTML = strokerate;
+    // document.getElementById("catch").innerHTML = catchangle;
+    {% for id, metric in metrics.items %}
+    document.getElementById("{{ id }}").innerHTML = {{ id }}_now;
+    document.getElementById("{{ id }}").className = 'bold';
+    {% endfor %}
+    {% for group in metricsgroups %}
+    try {
+      set_{{ group }}();
+    } catch (e) {}
+    {% endfor %}
+    try {
+      var newLatLng = new L.LatLng(lat, lon);
+      // console.log(newLatLng);
+      marker.setLatLng(newLatLng);
+    } catch (e) {
+      console.log('error')
+    }
+    console.log('changed all')
+    timeupdater = setInterval(updateTime, 1000);
   }
 
   output.oninput = function() {