diff --git a/rowers/templates/embedded_video.html b/rowers/templates/embedded_video.html
index 8fc5e384..112f4f60 100644
--- a/rowers/templates/embedded_video.html
+++ b/rowers/templates/embedded_video.html
@@ -179,8 +179,10 @@
         var lock = document.getElementById("lock");
         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;
+        }
       }
 
       function stopVideo() {
@@ -350,6 +352,77 @@
     slider.value = this.value+Math.round(player.getCurrentTime());
   }
 
+  // lock delay form field if checkbox checked
+  lock.oninput = function() {
+    if (this.checked) {
+      output.disabled = true;
+    } else {
+      output.disabled = false;
+    }
+  }
+  // Update the current slider value (each time the slider is changed)
+  slider.onchange = function() {
+    clearInterval(timeupdater)
+    if (lock.checked) {
+      if (this.value-output.value > 0) {
+        player.seekTo(this.value-output.value);
+      } else {
+        if (playing) {
+          player.seekTo(0);
+          player.playVideo();
+        }
+        else {
+          player.seekTo(0);
+          player.pauseVideo();
+        }
+      }
+    } else {
+      console.log('changing, not checked');
+      output.value = this.value-Math.round(player.getCurrentTime());
+    }
+    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() {
+    slider.value = this.value+Math.round(player.getCurrentTime());
+  }
+
   // lock delay form field if checkbox checked
   lock.oninput = function() {
     if (this.checked) {