diff --git a/docs/superpowers/plans/2026-06-27-scrub-driven-altitude-transitions.md b/docs/superpowers/plans/2026-06-27-scrub-driven-altitude-transitions.md
new file mode 100644
index 0000000..0cef39d
--- /dev/null
+++ b/docs/superpowers/plans/2026-06-27-scrub-driven-altitude-transitions.md
@@ -0,0 +1,803 @@
+# Scrub-driven Altitude Transitions Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Make the Altitude knob position *continuously* drive the scale transition — dragging the dial scrubs the morph video's `currentTime` and crossfades the two adjacent scale soundtracks by knob angle, holding wherever the knob stops, fully reversible.
+
+**Architecture:** Introduce a continuous float **position** `pos` (integers = altitudes/detents, fractions = mid-morph blend). A small pure module (`scrub.js`) owns the math (position→segment, frac→currentTime, audio gains, integer-crossing detection); `app.js` becomes the DOM/event glue that drives `pos` from the dial, seeks the morph `<video>`, crossfades two `<audio>` elements, and commits/locks/re-rolls on integer crossings. Phase 1 builds the interaction against the *current* (sparse-GOP) morphs to validate feel; Phase 2 re-bakes all 154 morphs all-intra for smooth seeking.
+
+**Tech Stack:** Vanilla JS (no framework, plain `<script>`), Node built-in `node --test` for pure-logic unit tests, Playwright for E2E, Python + ffmpeg/x264 for the morph re-bake (`simulator/build_pool_manifest.py`), git-LFS for media.
+
+## Global Constraints
+
+- **Spec contract:** `docs/superpowers/specs/2026-06-27-scrub-driven-altitude-transitions-design.md` — implement its locked decisions verbatim.
+- **In-between state:** hold the blend wherever the knob stops — **no auto-complete** (continuous-encoder model).
+- **Turn-back:** scrubs the **same** segment morph in reverse; landing back on the start integer re-locks **exactly** the clip you left (fully reversible).
+- **Destination randomness:** the destination altitude's clip is a random pick from its pool, **fixed for a single continuous gesture**, **re-rolled on each fresh approach** (each fresh entry into a segment from an integer).
+- **Scroll wheel:** auto-scrub one altitude over ~0.6 s, then lock. **Tap a dial label:** auto-scrub to that altitude the shortest way around.
+- **Lock-per-altitude** still holds: a resting altitude's clip stays locked until you commit into a different one.
+- **Canonical segment file (locked interpretation):** for the segment between altitude indices `lo` and `lo+1`, always use the **descend/forward** morph `morphByPair["<clip@lo>→<clip@lo+1>"]`, with `currentTime = frac × duration`. Reverse travel seeks the **same** file backward. `.rev` files are not used by the scrub interaction (they remain baked for back-compat).
+- **Git transport:** SSH only (`ssh://git@git.benstull.org/...`). No inline trailing comments on shell/CLI command lines.
+- **Pipeline:** ship via §9 — localhost + E2E green → PPE + E2E green → prod (prod human-gated). Every UI change carries its E2E browser tests as first-class tasks.
+
+---
+
+## File Structure
+
+- **Create** `simulator/static/scrub.js` — pure scrub math, UMD (browser global `HEFScrub` + CommonJS `module.exports`). No DOM.
+- **Create** `simulator/unit/scrub.test.js` — `node --test` unit suite for `scrub.js`.
+- **Create** `simulator/unit/README.md` — one-liner on running the unit suite.
+- **Modify** `simulator/static/index.html` — load `scrub.js` before `app.js`; add a second `<audio id="aud-b" loop preload="auto">`.
+- **Modify** `simulator/static/app.js` — replace the discrete drag/wheel/tap `advance()` flow with the scrub engine (`setPos`, `rebuildSegment`, `commitCrossings`, auto-scrub animator); two-element audio crossfade; client-side clip pick from `scale.pool`.
+- **Modify** `simulator/e2e/tests/altitude-lock.spec.ts` (or add `scrub.spec.ts`) — assert `currentTime` + the two audio gains track the dial angle and reverse on turn-back; full turn commits+locks; wheel auto-scrubs one altitude and locks.
+- **Modify** `simulator/build_pool_manifest.py` — `_make_transition` / `_make_reverse` emit **all-intra** H.264 (`-g 1 -keyint_min 1 -sc_threshold 0`) for seekable frames.
+- **Modify** `tests/test_build_pool_manifest.py` — assert the ffmpeg arg list carries the all-intra flags.
+
+---
+
+## Phase 1 — Scrub interaction against current morphs
+
+### Task 1: Pure scrub math module (`scrub.js`) + Node unit tests
+
+**Files:**
+- Create: `simulator/static/scrub.js`
+- Create: `simulator/unit/scrub.test.js`
+- Create: `simulator/unit/README.md`
+
+**Interfaces:**
+- Produces (all pure, no DOM), exported on `HEFScrub` and `module.exports`:
+  - `clamp01(x: number): number`
+  - `wrapIndex(i: number, n: number): number` — `((i % n) + n) % n`
+  - `segmentOf(pos: number): { lo: number, frac: number }` — `lo = floor(pos)`, `frac = pos - lo`
+  - `accumToPos(restPos: number, accumDeg: number, stepDeg: number): number` — `restPos + accumDeg/stepDeg`
+  - `fracToTime(frac: number, duration: number): number` — `clamp01(frac) * (duration || 0)`
+  - `crossfadeGains(frac: number): { from: number, to: number }` — `{ from: 1-clamp01(frac), to: clamp01(frac) }`
+  - `integerCrossings(prevPos: number, pos: number): Array<{ index: number, dir: number }>` — integers strictly crossed going `prevPos → pos`, in travel order, `dir` = `+1` descending (pos increasing) / `-1` ascending. Landing exactly on an integer counts as crossing it.
+
+- [ ] **Step 1: Write the failing unit suite**
+
+Create `simulator/unit/scrub.test.js`:
+
+```js
+"use strict";
+const test = require("node:test");
+const assert = require("node:assert/strict");
+const S = require("../static/scrub.js");
+
+test("clamp01 bounds to [0,1]", () => {
+  assert.equal(S.clamp01(-0.2), 0);
+  assert.equal(S.clamp01(0.4), 0.4);
+  assert.equal(S.clamp01(1.5), 1);
+});
+
+test("wrapIndex wraps both directions", () => {
+  assert.equal(S.wrapIndex(0, 5), 0);
+  assert.equal(S.wrapIndex(5, 5), 0);
+  assert.equal(S.wrapIndex(-1, 5), 4);
+  assert.equal(S.wrapIndex(7, 5), 2);
+});
+
+test("segmentOf splits floor and fraction", () => {
+  assert.deepEqual(S.segmentOf(2), { lo: 2, frac: 0 });
+  const s = S.segmentOf(2.4);
+  assert.equal(s.lo, 2);
+  assert.ok(Math.abs(s.frac - 0.4) < 1e-9);
+});
+
+test("accumToPos maps knob degrees to position", () => {
+  assert.equal(S.accumToPos(2, 0, 72), 2);
+  assert.equal(S.accumToPos(2, 72, 72), 3);
+  assert.equal(S.accumToPos(2, -36, 72), 1.5);
+});
+
+test("fracToTime clamps and scales by duration", () => {
+  assert.equal(S.fracToTime(0, 1.5), 0);
+  assert.equal(S.fracToTime(0.5, 1.5), 0.75);
+  assert.equal(S.fracToTime(1.2, 1.5), 1.5);
+  assert.equal(S.fracToTime(0.5, 0), 0);
+});
+
+test("crossfadeGains splits energy by fraction", () => {
+  assert.deepEqual(S.crossfadeGains(0), { from: 1, to: 0 });
+  assert.deepEqual(S.crossfadeGains(1), { from: 0, to: 1 });
+  assert.deepEqual(S.crossfadeGains(0.25), { from: 0.75, to: 0.25 });
+});
+
+test("integerCrossings: none while inside a segment", () => {
+  assert.deepEqual(S.integerCrossings(2.1, 2.9), []);
+  assert.deepEqual(S.integerCrossings(2.0, 2.5), []);
+  assert.deepEqual(S.integerCrossings(3.0, 2.5), []);
+});
+
+test("integerCrossings: ascending and descending single crossings", () => {
+  assert.deepEqual(S.integerCrossings(2.4, 3.0), [{ index: 3, dir: 1 }]);
+  assert.deepEqual(S.integerCrossings(2.0, 3.0), [{ index: 3, dir: 1 }]);
+  assert.deepEqual(S.integerCrossings(3.4, 3.0), [{ index: 3, dir: -1 }]);
+});
+
+test("integerCrossings: multiple crossings in travel order", () => {
+  assert.deepEqual(S.integerCrossings(2.4, 4.1), [{ index: 3, dir: 1 }, { index: 4, dir: 1 }]);
+  assert.deepEqual(S.integerCrossings(3.2, 1.8), [{ index: 3, dir: -1 }, { index: 2, dir: -1 }]);
+});
+```
+
+Create `simulator/unit/README.md`:
+
+```markdown
+# Simulator unit tests
+
+Pure-logic JS unit tests (no browser), run with Node's built-in test runner:
+
+    node --test simulator/unit/
+
+`scrub.test.js` covers `simulator/static/scrub.js` — the pure altitude-scrub math
+(position→segment, frac→currentTime, audio gains, integer-crossing detection).
+```
+
+- [ ] **Step 2: Run the suite to verify it fails**
+
+Run: `node --test simulator/unit/scrub.test.js`
+Expected: FAIL — `Cannot find module '../static/scrub.js'`.
+
+- [ ] **Step 3: Write `scrub.js` to pass**
+
+Create `simulator/static/scrub.js`:
+
+```js
+// Pure altitude-scrub math — no DOM. A continuous `pos` (float) is the knob:
+// integers are altitudes/detents, fractions are mid-morph blend. UMD so the
+// browser gets a `HEFScrub` global and `node --test` can require() it.
+(function (root, factory) {
+  const api = factory();
+  if (typeof module !== "undefined" && module.exports) module.exports = api;
+  else root.HEFScrub = api;
+})(typeof self !== "undefined" ? self : this, function () {
+  "use strict";
+
+  const clamp01 = (x) => Math.max(0, Math.min(1, x));
+  const wrapIndex = (i, n) => ((i % n) + n) % n;
+
+  function segmentOf(pos) {
+    const lo = Math.floor(pos);
+    return { lo, frac: pos - lo };
+  }
+
+  function accumToPos(restPos, accumDeg, stepDeg) {
+    return restPos + accumDeg / stepDeg;
+  }
+
+  function fracToTime(frac, duration) {
+    return clamp01(frac) * (duration || 0);
+  }
+
+  function crossfadeGains(frac) {
+    const f = clamp01(frac);
+    return { from: 1 - f, to: f };
+  }
+
+  // Integers strictly crossed moving prevPos -> pos, in travel order. Landing
+  // exactly on an integer counts as crossing it (it commits that altitude).
+  function integerCrossings(prevPos, pos) {
+    const out = [];
+    if (pos > prevPos) {
+      for (let k = Math.floor(prevPos) + 1; k <= pos + 1e-9; k++) out.push({ index: k, dir: 1 });
+    } else if (pos < prevPos) {
+      for (let k = Math.ceil(prevPos) - 1; k >= pos - 1e-9; k--) out.push({ index: k, dir: -1 });
+    }
+    return out;
+  }
+
+  return { clamp01, wrapIndex, segmentOf, accumToPos, fracToTime, crossfadeGains, integerCrossings };
+});
+```
+
+- [ ] **Step 4: Run the suite to verify it passes**
+
+Run: `node --test simulator/unit/scrub.test.js`
+Expected: PASS — all tests, 0 failures.
+
+- [ ] **Step 5: Commit**
+
+```bash
+git add simulator/static/scrub.js simulator/unit/scrub.test.js simulator/unit/README.md
+git commit -m "feat(sim): pure altitude-scrub math module + node unit suite"
+```
+
+---
+
+### Task 2: Two-element audio crossfade
+
+**Files:**
+- Modify: `simulator/static/index.html` (add `<audio id="aud-b">`; load `scrub.js`)
+- Modify: `simulator/static/app.js` (audio layer ~lines 950–1045)
+- Test: `simulator/unit/scrub.test.js` (gains already covered in Task 1 — no new pure logic)
+
+**Interfaces:**
+- Consumes: `HEFScrub.crossfadeGains`, `soundtrackUrl()`-style per-scale URL resolution.
+- Produces:
+  - `scaleAudioUrl(index: number): string|null` — the soundtrack URL for ring scale `index` (wrapped), using the ring `audio` field then `SCALE_AUDIO_FALLBACK`.
+  - `blendAudio(loIndex: number, frac: number): void` — element A plays scale `loIndex`, element B plays scale `loIndex+1` (wrapped), gains `crossfadeGains(frac)`; loads each element's src on first use per gesture. No-op when Audio toggle is off.
+  - `restAudio(index: number): void` — settle to a single scale at rest (full gain on the element holding `index`, fade the other to 0). Replaces the tail of `applyAudio()` for the at-rest case.
+
+- [ ] **Step 1: Add the second audio element + scrub.js script tag**
+
+In `simulator/static/index.html`, beside the existing `<audio id="aud" loop preload="auto"></audio>` (line ~21), add:
+
+```html
+        <audio id="aud" loop preload="auto"></audio>
+        <audio id="aud-b" loop preload="auto"></audio>
+```
+
+And load the pure module before `app.js` (line ~112):
+
+```html
+  <script src="/scrub.js"></script>
+  <script src="/app.js"></script>
+```
+
+- [ ] **Step 2: Write the failing E2E expectation (gains exist on two elements)**
+
+Add to `simulator/e2e/tests/altitude-lock.spec.ts` a focused check (full assertions land in Task 5; this verifies the element + hook exist):
+
+```ts
+test("two audio elements exist for crossfade", async ({ page }) => {
+  await boot(page);
+  const n = await page.evaluate(() => document.querySelectorAll("audio#aud, audio#aud-b").length);
+  expect(n).toBe(2);
+});
+```
+
+Run: `cd simulator/e2e && npx playwright test -g "two audio elements"`
+Expected: FAIL until the markup change is loaded (and PASS once the running server serves the new `index.html`).
+
+- [ ] **Step 3: Implement the crossfade audio layer in `app.js`**
+
+Replace the single-element logic around `playUrl`/`applyAudio` (app.js ~1019–1045). Keep `aud` as element A and add `audB` as element B; generalize URL resolution by index:
+
+```js
+const aud = $("aud");
+const audB = $("aud-b");
+let audLastErr = "";
+
+// Soundtrack URL for ring scale `index` (wrapped), ring `audio` field then fallback.
+function scaleAudioUrl(index) {
+  if (!ring || !ring.scales.length) return null;
+  const s = ring.scales[HEFScrub.wrapIndex(index, ring.scales.length)];
+  const a = s.audio || SCALE_AUDIO_FALLBACK[s.id];
+  return a ? "/media/audio/" + a : null;
+}
+
+// Start (once) and set the volume of one element to a given url. Safari needs the
+// first play() inside a user gesture; later programmatic plays reuse the element.
+function ensurePlaying(el, url, vol) {
+  if (!url) { el.volume = 0; if (!el.paused) el.pause(); return; }
+  if (el.dataset.url !== url) {
+    el.dataset.url = url;
+    el.src = mediaUrl(url);
+  }
+  if (el.paused) {
+    const pr = el.play();
+    if (pr) pr.then(() => { audLastErr = ""; updateAudioStatus(); })
+            .catch((e) => { audLastErr = "play BLOCKED: " + ((e && e.name) || e); updateAudioStatus(); });
+  }
+  el.volume = HEFScrub.clamp01(vol);
+}
+
+// Mid-segment: A = scale `loIndex`, B = scale loIndex+1, gains by frac.
+function blendAudio(loIndex, frac) {
+  if (!$("audio").checked) return;
+  const g = HEFScrub.crossfadeGains(frac);
+  ensurePlaying(aud, scaleAudioUrl(loIndex), g.from);
+  ensurePlaying(audB, scaleAudioUrl(loIndex + 1), g.to);
+  updateAudioStatus();
+}
+
+// At rest on a single altitude: the element already holding it stays at full gain,
+// the other fades to 0. Picks whichever element currently carries `index`'s url.
+function restAudio(index) {
+  if (!$("audio").checked) { fadeVolume(aud, 0, FADE_MS, () => aud.pause()); fadeVolume(audB, 0, FADE_MS, () => audB.pause()); return; }
+  const url = scaleAudioUrl(index);
+  const onB = audB.dataset.url === url && url;
+  const active = onB ? audB : aud;
+  const idle = onB ? aud : audB;
+  ensurePlaying(active, url, 1);
+  fadeVolume(idle, 0, FADE_MS);
+}
+```
+
+Then make the Audio toggle and altitude-rest paths call `restAudio(ringIndex)` instead of the old `applyAudio()` swap. Keep `applyAudio()` as a thin shim that calls `restAudio(ringIndex)` so existing call sites (e.g. the toggle handler at ~1073, `update()`) keep working:
+
+```js
+function applyAudio() { restAudio(ringIndex); }
+```
+
+- [ ] **Step 4: Run unit suite + the focused E2E**
+
+Run: `node --test simulator/unit/scrub.test.js`
+Expected: PASS.
+Run: `cd simulator/e2e && npx playwright test -g "two audio elements"` (with the dev server running)
+Expected: PASS.
+
+- [ ] **Step 5: Commit**
+
+```bash
+git add simulator/static/index.html simulator/static/app.js simulator/e2e/tests/altitude-lock.spec.ts
+git commit -m "feat(sim): two-element audio crossfade keyed by scrub fraction"
+```
+
+---
+
+### Task 3: Scrub engine — drag drives `pos`, seeks the morph, commits/locks/re-rolls
+
+**Files:**
+- Modify: `simulator/static/app.js` (`onDialDown/Move/Up` ~766–795; `advance` ~640–679; `playTransition` ~595–636; needle/render ~739–751)
+- Test: `simulator/unit/scrub.test.js` (pure parts covered; engine glue is DOM, covered by E2E in Task 5)
+
+**Interfaces:**
+- Consumes: `HEFScrub.*`, `morphByPair`, `scale.pool` (client ring), `mediaUrl`, `setNeedle`, `dialStep`, `ensureClipMedia`/`update` (base-clip loop), `blendAudio`/`restAudio`.
+- Produces:
+  - `pos` (module-level float; rest value = `ringIndex`).
+  - `pickPoolClip(index: number): string` — random `clip_id` from ring scale `index`'s pool (wrapped).
+  - `rebuildSegment(lo: number, enteredFrom: number): void` — sets `activeSeg = { lo, clipLo, clipHi, file }`; the side equal to the just-rested altitude takes `activeClipId`, the other is a fresh `pickPoolClip` (re-roll); `file = morphByPair["<clipLo>→<clipHi>"]` (descend canonical).
+  - `setPos(next: number, opts?: { commit?: boolean }): void` — clamps thrash via one seek per rAF; seeks `vid.currentTime = fracToTime(frac, dur)`; `setNeedle(next * dialStep())`; `blendAudio(lo, frac)`; processes `integerCrossings(pos, next)` to commit/lock/re-roll; updates `pos`.
+  - `commitTo(index: number): void` — `ringIndex = wrapIndex(index,n)`, `activeClipId = clip at that index for the active segment`, settle base loop + `restAudio` when frac becomes 0.
+
+- [ ] **Step 1: Write the failing E2E (drag partway tracks currentTime + gains)**
+
+Add to the E2E spec (full version in Task 5; this drives the engine):
+
+```ts
+test("dragging the dial scrubs morph currentTime and audio gains", async ({ page }) => {
+  await boot(page);
+  // Drag the dial ~40% of one detent (clockwise = descend).
+  const box = await page.locator("#dial").boundingBox();
+  const cx = box!.x + box!.width / 2, cy = box!.y + box!.height / 2;
+  await page.mouse.move(cx, cy - 30);
+  await page.mouse.down();
+  await page.mouse.move(cx + 18, cy - 24, { steps: 8 });   // partial turn
+  const state = await page.evaluate(() => ({
+    t: (document.querySelector("video") as HTMLVideoElement).currentTime,
+    ga: (document.querySelector("#aud") as HTMLAudioElement).volume,
+    gb: (document.querySelector("#aud-b") as HTMLAudioElement).volume,
+  }));
+  expect(state.t).toBeGreaterThan(0);          // morph scrubbed off frame 0
+  expect(state.gb).toBeGreaterThan(0);         // next scale audio fading in
+  expect(state.ga).toBeLessThan(1);            // current scale fading out
+  await page.mouse.up();
+});
+```
+
+Run: `cd simulator/e2e && npx playwright test -g "scrubs morph currentTime"`
+Expected: FAIL (engine not built yet).
+
+- [ ] **Step 2: Implement the scrub engine in `app.js`**
+
+Add the position state + segment + setPos near the dial logic, and rewrite `onDialMove`/`onDialUp` to drive it live:
+
+```js
+let pos = 0;                 // continuous knob position; rest value == ringIndex
+let activeSeg = null;        // { lo, clipLo, clipHi, file }
+let seekPending = false;     // throttle: one currentTime seek per rAF
+
+function pickPoolClip(index) {
+  const n = ring.scales.length;
+  const s = ring.scales[HEFScrub.wrapIndex(index, n)];
+  const pool = (s.pool && s.pool.length) ? s.pool : [{ clip_id: s.clip_id }];
+  return pool[Math.floor(Math.random() * pool.length)].clip_id;
+}
+
+// Build (or re-roll) the segment [lo, lo+1]. The side equal to the rested altitude
+// keeps the locked clip; the other end is a fresh random pick (re-roll).
+function rebuildSegment(lo, enteredFrom) {
+  const n = ring.scales.length;
+  const loId = (enteredFrom === HEFScrub.wrapIndex(lo, n)) ? activeClipId : pickPoolClip(lo);
+  const hiId = (enteredFrom === HEFScrub.wrapIndex(lo + 1, n)) ? activeClipId : pickPoolClip(lo + 1);
+  const file = morphByPair[`${loId}→${hiId}`] || null;
+  activeSeg = { lo, clipLo: loId, clipHi: hiId, file };
+  if (file) {
+    overlay.style.opacity = "0"; affectLayer.style.opacity = "0"; tint.style.opacity = "0";
+    vid.style.filter = "none"; vid.loop = false; vid.style.opacity = "1";
+    if (vid.dataset.morph !== file) { vid.dataset.morph = file; vid.src = mediaUrl(file); vid.pause(); }
+    (window.__hefMorphs || (window.__hefMorphs = [])).push(file);
+  }
+}
+
+function setPos(next) {
+  if (!ring || ring.scales.length < 2) return;
+  const n = ring.scales.length;
+  // Commit every integer crossed between the old and new position.
+  for (const c of HEFScrub.integerCrossings(pos, next)) {
+    ringIndex = HEFScrub.wrapIndex(c.index, n);
+    // The clip at the crossed integer is whichever segment end matches it.
+    if (activeSeg) activeClipId = (HEFScrub.wrapIndex(activeSeg.lo, n) === ringIndex) ? activeSeg.clipLo : activeSeg.clipHi;
+    activeSeg = null;          // force a fresh-approach re-roll for the next segment
+  }
+  pos = next;
+  const { lo, frac } = HEFScrub.segmentOf(pos);
+  if (frac === 0) {            // settled on an altitude
+    currentClipId = null;      // force ensureClipMedia to reload + loop the locked clip
+    update();
+    restAudio(ringIndex);
+    setNeedle(ringIndex * dialStep());
+    return;
+  }
+  if (!activeSeg || activeSeg.lo !== lo) rebuildSegment(lo, ringIndex);
+  setNeedle(pos * dialStep());
+  blendAudio(lo, frac);
+  if (activeSeg.file && !seekPending) {        // throttle seeks to one per frame
+    seekPending = true;
+    requestAnimationFrame(() => {
+      seekPending = false;
+      if (vid.dataset.morph === activeSeg.file) vid.currentTime = HEFScrub.fracToTime(frac, vid.duration);
+    });
+  }
+}
+```
+
+Rewrite the drag handlers to drive `pos` live (replacing the no-live-follow `onDialMove` and the commit-on-release `onDialUp`):
+
+```js
+function onDialDown(e) {
+  if (!ring || ring.scales.length < 2) return;
+  e.preventDefault();
+  dialDrag = { lastAng: dialAngle(e), accum: 0, moved: 0, target: e.target, restPos: ringIndex };
+}
+function onDialMove(e) {
+  if (!dialDrag) return;
+  const a = dialAngle(e);
+  dialDrag.accum += angDelta(a, dialDrag.lastAng);
+  dialDrag.lastAng = a;
+  dialDrag.moved += Math.abs(angDelta(a, dialDrag.lastAng));
+  setPos(HEFScrub.accumToPos(dialDrag.restPos, dialDrag.accum, dialStep()));   // LIVE scrub
+}
+function onDialUp(e) {
+  if (!dialDrag) return;
+  const { moved, target } = dialDrag;
+  dialDrag = null;
+  if (moved < 6) {                                  // a tap, not a turn
+    if (target && target.classList && target.classList.contains("dial-label")) jumpToScale(+target.getAttribute("data-index"));
+    return;
+  }
+  // No auto-complete: hold wherever the knob stopped (continuous-encoder model).
+}
+```
+
+Keep `renderDial()` reading `pos` for the needle when mid-segment, else `ringIndex`. Retire `advance()`'s body (or leave it unused) — wheel/tap use the auto-scrub in Task 4.
+
+- [ ] **Step 3: Run the focused E2E**
+
+Run: `cd simulator/e2e && npx playwright test -g "scrubs morph currentTime"` (dev server running)
+Expected: PASS.
+
+- [ ] **Step 4: Run the unit suite (no regressions)**
+
+Run: `node --test simulator/unit/scrub.test.js`
+Expected: PASS.
+
+- [ ] **Step 5: Commit**
+
+```bash
+git add simulator/static/app.js simulator/e2e/tests/altitude-lock.spec.ts
+git commit -m "feat(sim): scrub engine — drag drives pos, seeks morph, commits+locks+re-rolls"
+```
+
+---
+
+### Task 4: Wheel + tap become auto-scrubs, then lock
+
+**Files:**
+- Modify: `simulator/static/app.js` (`onWheel` ~681–691; `jumpToScale` ~798–805)
+
+**Interfaces:**
+- Consumes: `setPos`, `ringIndex`, `pos`, `HEFScrub.wrapIndex`.
+- Produces:
+  - `autoScrub(targetPos: number, ms = 600): void` — rAF-animates `pos` from its current value to `targetPos` (calling `setPos` each frame), landing exactly on the integer target, then locks (frac 0 settles in `setPos`).
+
+- [ ] **Step 1: Write the failing E2E (wheel auto-scrubs one altitude then locks)**
+
+Add to the E2E spec:
+
+```ts
+test("wheel auto-scrubs one altitude and locks", async ({ page }) => {
+  await boot(page);
+  const start = (await page.locator("#scale-name").textContent())!;
+  await page.locator("#stage").dispatchEvent("wheel", { deltaY: 60 });
+  await page.waitForFunction((s) => document.querySelector("#scale-name")?.textContent !== s, start, { timeout: 20000 });
+  const landed = (await page.locator("#scale-name").textContent())!;
+  expect(landed).toContain("orbit");
+  // Mid-flight currentTime moved; after landing the morph is settled (frac 0).
+  await page.waitForTimeout(1500);
+  expect(await page.locator("#scale-name").textContent()).toBe(landed);    // locked
+});
+```
+
+Run: `cd simulator/e2e && npx playwright test -g "wheel auto-scrubs"`
+Expected: FAIL.
+
+- [ ] **Step 2: Implement `autoScrub` and rewire wheel + tap**
+
+```js
+let autoRaf = 0;
+function autoScrub(targetPos, ms = 600) {
+  if (autoRaf) cancelAnimationFrame(autoRaf);
+  const fromPos = pos, dist = targetPos - fromPos;
+  if (!dist) { setPos(targetPos); return; }
+  let startTs = null;
+  const tick = (ts) => {
+    if (startTs === null) startTs = ts;
+    const k = Math.min(1, (ts - startTs) / ms);
+    setPos(fromPos + dist * k);
+    if (k < 1) autoRaf = requestAnimationFrame(tick);
+    else { autoRaf = 0; setPos(targetPos); }     // land exactly + lock (frac 0)
+  };
+  autoRaf = requestAnimationFrame(tick);
+}
+
+let wheelAccum = 0, wheelTimer = null;
+function onWheel(e) {
+  e.preventDefault();
+  wheelAccum += e.deltaY;
+  clearTimeout(wheelTimer);
+  wheelTimer = setTimeout(() => {
+    const detents = Math.trunc(wheelAccum / 60) || (wheelAccum > 0 ? 1 : -1);
+    wheelAccum = 0;
+    if (detents) autoScrub(ringIndex + detents);
+  }, 90);
+}
+
+function jumpToScale(idx) {
+  if (!ring) return;
+  const n = ring.scales.length;
+  let d = (idx - ringIndex) % n;
+  if (d > n / 2) d -= n;
+  if (d < -n / 2) d += n;
+  if (d) autoScrub(ringIndex + d);
+}
+```
+
+- [ ] **Step 3: Run the focused E2E**
+
+Run: `cd simulator/e2e && npx playwright test -g "wheel auto-scrubs"` (dev server running)
+Expected: PASS.
+
+- [ ] **Step 4: Commit**
+
+```bash
+git add simulator/static/app.js
+git commit -m "feat(sim): wheel + label-tap auto-scrub one/path of altitudes, then lock"
+```
+
+---
+
+### Task 5: Full E2E tier for scrub-driven transitions
+
+**Files:**
+- Modify: `simulator/e2e/tests/altitude-lock.spec.ts`
+
+**Interfaces:**
+- Consumes: the running simulator, `window.__hefMorphs`, `#scale-name`, `#dial`, `video`, `#aud`/`#aud-b`.
+
+- [ ] **Step 1: Replace the `.rev`-asserting reverse test with a scrub-reverse test**
+
+The old "zoom back out plays a reverse morph" test asserted a `.rev.mp4` file. Under the scrub model, turn-back seeks the **same** segment morph backward. Replace it:
+
+```ts
+test("turn-back scrubs the same morph in reverse and re-locks the start clip", async ({ page }) => {
+  await boot(page);
+  const box = await page.locator("#dial").boundingBox();
+  const cx = box!.x + box!.width / 2, cy = box!.y + box!.height / 2;
+  const read = () => page.evaluate(() => ({
+    t: (document.querySelector("video") as HTMLVideoElement).currentTime,
+    ga: (document.querySelector("#aud") as HTMLAudioElement).volume,
+    gb: (document.querySelector("#aud-b") as HTMLAudioElement).volume,
+    name: document.querySelector("#scale-name")?.textContent,
+  }));
+
+  await page.mouse.move(cx, cy - 30);
+  await page.mouse.down();
+  await page.mouse.move(cx + 22, cy - 20, { steps: 10 });   // descend partway
+  const fwd = await read();
+  await page.mouse.move(cx + 4, cy - 30, { steps: 10 });     // turn back toward start
+  const back = await read();
+  await page.mouse.up();
+
+  expect(back.t).toBeLessThan(fwd.t);          // morph seeking backward
+  expect(back.gb).toBeLessThan(fwd.gb);        // next-scale audio receding
+  expect(back.name).toContain("cosmos");       // re-locked the altitude we left
+});
+```
+
+- [ ] **Step 2: Add the full-turn commit+lock test**
+
+```ts
+test("a full turn commits and locks the destination clip", async ({ page }) => {
+  await boot(page);
+  const start = (await page.locator("#scale-name").textContent())!;
+  const box = await page.locator("#dial").boundingBox();
+  const cx = box!.x + box!.width / 2, cy = box!.y + box!.height / 2;
+  await page.mouse.move(cx, cy - 30);
+  await page.mouse.down();
+  await page.mouse.move(cx + 30, cy, { steps: 6 });
+  await page.mouse.move(cx, cy + 30, { steps: 6 });          // ~full detent clockwise
+  await page.mouse.up();
+  await page.waitForFunction((s) => document.querySelector("#scale-name")?.textContent !== s, start, { timeout: 20000 });
+  const landed = (await page.locator("#scale-name").textContent())!;
+  expect(landed).toContain("orbit");
+  const played = await page.evaluate(() => (window as any).__hefMorphs || []);
+  expect(played[0]).toMatch(/^transitions\/cosmos.*\.mp4$/);
+  await page.waitForTimeout(2000);
+  expect(await page.locator("#scale-name").textContent()).toBe(landed);   // locked
+});
+```
+
+- [ ] **Step 3: Keep the wheel + drag tests from Tasks 2–4; run the whole tier**
+
+Run: `cd simulator/e2e && npx playwright test`
+Expected: PASS — all scrub tests green (drag-scrub, turn-back, full-turn, wheel, two-audio-elements).
+
+- [ ] **Step 4: Commit**
+
+```bash
+git add simulator/e2e/tests/altitude-lock.spec.ts
+git commit -m "test(e2e): scrub tier asserts currentTime + audio gains track the dial, reverse, commit-lock, wheel"
+```
+
+---
+
+### Task 6: Phase-1 localhost verification
+
+**Files:** none (verification task).
+
+- [ ] **Step 1: Run the unit suite**
+
+Run: `node --test simulator/unit/`
+Expected: PASS.
+
+- [ ] **Step 2: Run the full Python test suite (no regressions)**
+
+Run: `python -m pytest -q`
+Expected: PASS (existing tally; no new failures).
+
+- [ ] **Step 3: Boot the simulator and run E2E against it**
+
+Run (server): start the simulator dev server per `simulator/` README on its configured port with the venv python.
+Run (tests): `cd simulator/e2e && npx playwright test`
+Expected: all PASS.
+
+- [ ] **Step 4: Eyeball the feel**
+
+Confirm by hand: slow drag eases the morph slowly; fast drag races it; stopping mid-drag holds a blended frame with mixed audio; turning back reverses; the wheel auto-scrubs one altitude and locks; a label tap travels the shortest way. Note any steppiness (expected on sparse-GOP morphs — Phase 2 fixes it).
+
+- [ ] **Step 5: Checkpoint the transcript**
+
+Re-publish the in-progress transcript (no commit needed beyond what tasks already pushed).
+
+---
+
+## Phase 2 — All-intra morph re-bake for smooth seeking
+
+### Task 7: Re-bake the 154 morphs all-intra (dense keyframes)
+
+**Files:**
+- Modify: `simulator/build_pool_manifest.py` (`_make_transition` ~402–417, `_make_reverse` ~420–429)
+- Test: `tests/test_build_pool_manifest.py`
+
+**Interfaces:**
+- Produces: every baked morph encoded all-intra (each frame a keyframe) so arbitrary-frame seeking is smooth.
+
+- [ ] **Step 1: Write the failing arg-builder test**
+
+`_make_transition`/`_make_reverse` currently call `subprocess.run` directly, so factor the ffmpeg command into a pure builder to test it. Add to `simulator/build_pool_manifest.py`:
+
+```python
+ALL_INTRA = ["-c:v", "libx264", "-g", "1", "-keyint_min", "1", "-sc_threshold", "0", "-pix_fmt", "yuv420p"]
+```
+
+Add a pure helper and a test. In `tests/test_build_pool_manifest.py`:
+
+```python
+from simulator import build_pool_manifest as B
+
+def test_transition_cmd_is_all_intra():
+    cmd = B.transition_cmd("ffmpeg", "/a/base.mp4", "/b/base.mp4", "/out/x__y.mp4")
+    assert "-g" in cmd and cmd[cmd.index("-g") + 1] == "1"
+    assert "-keyint_min" in cmd and cmd[cmd.index("-keyint_min") + 1] == "1"
+    assert "-sc_threshold" in cmd and cmd[cmd.index("-sc_threshold") + 1] == "0"
+
+def test_reverse_cmd_is_all_intra():
+    cmd = B.reverse_cmd("ffmpeg", "/out/x__y.mp4", "/out/x__y.rev.mp4")
+    assert "-g" in cmd and cmd[cmd.index("-g") + 1] == "1"
+    assert "reverse" in " ".join(cmd)
+```
+
+Run: `python -m pytest tests/test_build_pool_manifest.py -q`
+Expected: FAIL — `transition_cmd`/`reverse_cmd` not defined.
+
+- [ ] **Step 2: Extract `transition_cmd`/`reverse_cmd` and apply all-intra flags**
+
+```python
+def transition_cmd(ff, a, b, out):
+    norm = "trim=0:3,setpts=PTS-STARTPTS,scale=1280:720,fps=25,setsar=1,format=yuv420p"
+    return [
+        ff, "-y", "-i", str(a), "-i", str(b), "-filter_complex",
+        f"[0:v]{norm}[a];[1:v]{norm}[b];"
+        "[a][b]xfade=transition=zoomin:duration=1.5:offset=0.75,format=yuv420p[v]",
+        "-map", "[v]", "-an", *ALL_INTRA, str(out),
+    ]
+
+def reverse_cmd(ff, forward, out):
+    return [ff, "-y", "-i", str(forward), "-vf", "reverse", "-an", *ALL_INTRA, str(out)]
+```
+
+Then make `_make_transition`/`_make_reverse` call these builders inside `subprocess.run(..., check=True, capture_output=True)`.
+
+- [ ] **Step 3: Run the arg-builder test**
+
+Run: `python -m pytest tests/test_build_pool_manifest.py -q`
+Expected: PASS.
+
+- [ ] **Step 4: Regenerate the morph media**
+
+Run: `python simulator/build_pool_manifest.py` (or its documented `generate_media` entrypoint) to re-bake all 154 morphs all-intra. Confirm files regrew (sparse → dense keyframes; expect ~0.5–0.9 GB total, each clip well under the 25 MB LFS/proxy ceiling noted in memory).
+
+- [ ] **Step 5: Commit the re-baked media via git-LFS**
+
+```bash
+git add simulator/sample_media/transitions
+git commit -m "feat(pipeline): re-bake 154 morphs all-intra for smooth scrub seeking (LFS)"
+```
+
+Confirm they are LFS pointers: `git lfs ls-files | head`.
+
+---
+
+### Task 8: Phase-2 verification — smooth scrub on dense keyframes
+
+**Files:** none (verification task).
+
+- [ ] **Step 1: Re-run the unit + E2E suites against re-baked media**
+
+Run: `node --test simulator/unit/` → PASS.
+Run (server up): `cd simulator/e2e && npx playwright test` → PASS.
+
+- [ ] **Step 2: Eyeball smoothness**
+
+Confirm the scrub now seeks smoothly frame-to-frame (no stepping) on a slow drag across a full segment.
+
+- [ ] **Step 3: Push the branch**
+
+```bash
+git push -u origin session-0026
+```
+
+---
+
+## Ship via §9 (execution, not a code task)
+
+After Phase 1 + Phase 2 are green on localhost (unit + E2E), ship through the mandatory pipeline:
+1. **localhost + E2E green** (Tasks 6 + 8).
+2. **PPE deploy + E2E green** (flotilla; provision PPE if it doesn't exist yet). Stamp the `release/<YYYY-MM-DDTHH-MM>` tag.
+3. **prod is human-gated** — the operator promotes the validated tag; the session stops at PPE-green.
+
+---
+
+## Self-Review
+
+**Spec coverage:**
+- Core model (continuous `pos`, frac drives currentTime + audio) → Tasks 1, 3, 2.
+- In-between hold / no auto-complete → Task 3 (`onDialUp` holds).
+- Turn-back reversible / re-lock start clip → Tasks 3, 5.
+- Destination randomness fixed-per-gesture, re-roll on fresh approach → Task 3 (`rebuildSegment`, re-roll on `activeSeg` reset at crossing).
+- Scroll wheel auto-scrub then lock; tap shortest way → Task 4.
+- Lock-per-altitude preserved → Task 3 (`commit` sets `activeClipId`; frac 0 settles base loop).
+- Audio crossfade two adjacent soundtracks by frac → Task 2.
+- All-intra re-bake (154 morphs, LFS) → Task 7.
+- Unit tests (position→segment, frac→time, commit on crossing, re-roll, reverse) → Task 1 (pure) + E2E for glue.
+- Playwright E2E (currentTime + gains track angle, reverse, full-turn commit-lock, wheel) → Task 5.
+- Phasing (interaction first, re-bake second) → Phase 1 then Phase 2.
+
+**Placeholder scan:** none — every code step carries real code and exact commands.
+
+**Type consistency:** `setPos`, `rebuildSegment`, `activeSeg {lo,clipLo,clipHi,file}`, `pickPoolClip`, `blendAudio(loIndex,frac)`, `restAudio(index)`, `scaleAudioUrl(index)`, `autoScrub(targetPos,ms)`, `HEFScrub.*` names are used consistently across Tasks 1–5. `transition_cmd`/`reverse_cmd`/`ALL_INTRA` consistent in Tasks 7.
+
+**Open interpretation (logged as deferred decision):** the canonical-segment-file choice (always the descend/forward morph, scrubbed bidirectionally; `.rev` unused by scrub) reinterprets the spec's literal `morphByPair["<from>→<to>"]` directed lookup in favor of its "scrub the same morph in reverse" + full-reversibility requirements. Surfaced for operator awareness at finalize.
diff --git a/simulator/build_pool_manifest.py b/simulator/build_pool_manifest.py
index 362f93d..4dfb76d 100644
--- a/simulator/build_pool_manifest.py
+++ b/simulator/build_pool_manifest.py
@@ -399,6 +399,28 @@ def _adjacent_edges() -> list[tuple[str, str]]:
     return [(RING_ORDER[i], RING_ORDER[(i + 1) % n]) for i in range(n)]
 
 
+# All-intra H.264: every frame a keyframe, so the scrub interaction can seek to an
+# arbitrary frame smoothly (a sparse GOP scrubs "steppy"). Files grow, but each clip
+# stays well under the LFS/proxy ceiling. (Scrub-driven-transitions design §4.)
+ALL_INTRA = ["-c:v", "libx264", "-g", "1", "-keyint_min", "1", "-sc_threshold", "0", "-pix_fmt", "yuv420p"]
+
+
+def transition_cmd(ff: str, a: str, b: str, out: str) -> list[str]:
+    """The ffmpeg argv for a forward (zoom-in) member-pair morph, baked all-intra."""
+    norm = "trim=0:3,setpts=PTS-STARTPTS,scale=1280:720,fps=25,setsar=1,format=yuv420p"
+    return [
+        ff, "-y", "-i", str(a), "-i", str(b), "-filter_complex",
+        f"[0:v]{norm}[a];[1:v]{norm}[b];"
+        "[a][b]xfade=transition=zoomin:duration=1.5:offset=0.75,format=yuv420p[v]",
+        "-map", "[v]", "-an", *ALL_INTRA, str(out),
+    ]
+
+
+def reverse_cmd(ff: str, forward: str, out: str) -> list[str]:
+    """The ffmpeg argv for the zoom-OUT companion (forward played backward), all-intra."""
+    return [ff, "-y", "-i", str(forward), "-vf", "reverse", "-an", *ALL_INTRA, str(out)]
+
+
 def _make_transition(ff: str, src_clip: str, dst_clip: str) -> Path:
     """A zoom/warp morph between two CLIP MEMBERS' base footage (the well-liked
     orbit-coast recipe), keyed by clip id so every adjacent member pair gets its
@@ -407,13 +429,7 @@ def _make_transition(ff: str, src_clip: str, dst_clip: str) -> Path:
     b = MEDIA / dst_clip / "base.mp4"
     out = MEDIA / "transitions" / f"{src_clip}__{dst_clip}.mp4"
     out.parent.mkdir(parents=True, exist_ok=True)
-    norm = "trim=0:3,setpts=PTS-STARTPTS,scale=1280:720,fps=25,setsar=1,format=yuv420p"
-    subprocess.run([
-        ff, "-y", "-i", str(a), "-i", str(b), "-filter_complex",
-        f"[0:v]{norm}[a];[1:v]{norm}[b];"
-        "[a][b]xfade=transition=zoomin:duration=1.5:offset=0.75,format=yuv420p[v]",
-        "-map", "[v]", "-an", str(out),
-    ], check=True, capture_output=True)
+    subprocess.run(transition_cmd(ff, str(a), str(b), str(out)), check=True, capture_output=True)
     return out
 
 
@@ -423,9 +439,7 @@ def _make_reverse(ff: str, forward: Path) -> Path:
     crosses its edge `reversed`; the renderer then plays this file, so zooming out
     recedes from the current scale back to the higher one instead of zooming in."""
     out = forward.with_suffix(".rev.mp4")
-    subprocess.run([
-        ff, "-y", "-i", str(forward), "-vf", "reverse", "-an", str(out),
-    ], check=True, capture_output=True)
+    subprocess.run(reverse_cmd(ff, str(forward), str(out)), check=True, capture_output=True)
     return out
 
 
diff --git a/simulator/e2e/tests/altitude-lock.spec.ts b/simulator/e2e/tests/altitude-lock.spec.ts
index 5a727ed..479121c 100644
--- a/simulator/e2e/tests/altitude-lock.spec.ts
+++ b/simulator/e2e/tests/altitude-lock.spec.ts
@@ -29,6 +29,140 @@ async function wheelOnStage(page: Page, deltaY: number) {
   await page.locator("#stage").dispatchEvent("wheel", { deltaY });
 }
 
+// The Audio control is a 0–10 level slider; set it to full + fire `input` directly
+// (headless Chromium relaxes the autoplay gesture requirement).
+async function enableAudio(page: Page) {
+  await page.evaluate(() => {
+    const c = document.querySelector("#audio") as HTMLInputElement;
+    c.value = "10";
+    c.dispatchEvent(new Event("input", { bubbles: true }));
+  });
+}
+
+// The Video toggle gates the base-clip loop (update() only loads media when video is
+// shown). Same hidden-checkbox pattern.
+async function enableVideo(page: Page) {
+  await page.evaluate(() => {
+    const c = document.querySelector("#visual") as HTMLInputElement;
+    c.checked = true;
+    c.dispatchEvent(new Event("change", { bubbles: true }));
+  });
+}
+
+test("two audio elements exist for crossfade", async ({ page }) => {
+  await boot(page);
+  const n = await page.evaluate(() => document.querySelectorAll("audio#aud, audio#aud-b").length);
+  expect(n).toBe(2);
+});
+
+test("a new volume fade supersedes a stale one (audio not silenced after landing)", async ({ page }) => {
+  await boot(page);
+  // Reproduce the race: a fade-to-0 in flight, then the same element is brought back
+  // up (as happens when a faded idle element becomes the newly-landed active scale).
+  // The stale fade must NOT drag it back to 0.
+  const vol = await page.evaluate(async () => {
+    const a = document.querySelector("#aud") as HTMLAudioElement;
+    a.volume = 1;
+    (window as any).__hefFade(a, 0, 600);              // start a slow fade to 0
+    await new Promise((r) => setTimeout(r, 120));      // let it ramp partway down
+    (window as any).__hefFade(a, 0.8, 90);             // new fade up — must cancel the old one
+    await new Promise((r) => setTimeout(r, 350));      // well past both fades
+    return a.volume;
+  });
+  expect(vol).toBeGreaterThan(0.7);                    // ended near 0.8, not dragged to 0
+});
+
+test("audio is a 0-10 level dial, defaulting to 0", async ({ page }) => {
+  await boot(page);
+  const ctl = await page.evaluate(() => {
+    const c = document.querySelector("#audio") as HTMLInputElement;
+    return { type: c.type, min: c.min, max: c.max, value: c.value };
+  });
+  expect(ctl.type).toBe("range");
+  expect(ctl.min).toBe("0");
+  expect(ctl.max).toBe("10");
+  expect(ctl.value).toBe("0");                 // silent until raised
+});
+
+test("turning video on for the first time lifts audio to 3/10", async ({ page }) => {
+  await boot(page);
+  expect(await page.evaluate(() => (document.querySelector("#audio") as HTMLInputElement).value)).toBe("0");
+  await enableVideo(page);                       // first video-on couples audio at a gentle level
+  await expect.poll(() => page.evaluate(() => (document.querySelector("#audio") as HTMLInputElement).value)).toBe("3");
+  // The level label reflects it.
+  expect(await page.evaluate(() => document.querySelector("#audio-level-val")?.textContent)).toBe("3");
+});
+
+test("dragging the dial scrubs morph currentTime and audio gains", async ({ page }) => {
+  await boot(page);
+  await enableAudio(page);                                 // hidden custom toggle → set + dispatch change
+  const box = (await page.locator("#dial").boundingBox())!;
+  const cx = box.x + box.width / 2, cy = box.y + box.height / 2;
+  await page.mouse.move(cx, cy - 30);
+  await page.mouse.down();
+  await page.mouse.move(cx + 18, cy - 24, { steps: 8 });  // partial clockwise turn (~0.5 detent)
+  // The currentTime seek is throttled to one rAF; wait for it to land.
+  await page.waitForFunction(() => (document.querySelector("video") as HTMLVideoElement).currentTime > 0, null, { timeout: 5000 });
+  const state = await page.evaluate(() => ({
+    t: (document.querySelector("video") as HTMLVideoElement).currentTime,
+    ga: (document.querySelector("#aud") as HTMLAudioElement).volume,
+    gb: (document.querySelector("#aud-b") as HTMLAudioElement).volume,
+  }));
+  expect(state.t).toBeGreaterThan(0);          // morph scrubbed off frame 0
+  expect(state.gb).toBeGreaterThan(0);         // next scale fading in
+  expect(state.ga).toBeLessThan(1);            // current scale fading out
+  await page.mouse.up();
+});
+
+test("wheel auto-scrubs one altitude and locks", async ({ page }) => {
+  await boot(page);
+  const start = (await page.locator("#scale-name").textContent())!;
+  await wheelOnStage(page, 60);                          // wheel down = descend one altitude
+  await page.waitForFunction((s) => document.querySelector("#scale-name")?.textContent !== s, start, { timeout: 20000 });
+  const landed = (await page.locator("#scale-name").textContent())!;
+  expect(landed).toContain("orbit");
+  await page.waitForTimeout(1500);
+  expect(await page.locator("#scale-name").textContent()).toBe(landed);    // locked
+});
+
+test("auto-scrub speed is constant per altitude (a 2-step jump takes ~2x a 1-step)", async ({ page }) => {
+  await boot(page);
+  async function timeJump(deltaY: number, target: string): Promise<number> {
+    const t0 = await page.evaluate(() => performance.now());
+    await page.locator("#stage").dispatchEvent("wheel", { deltaY });
+    await page.waitForFunction((tgt) => !!document.querySelector("#scale-name")?.textContent?.includes(tgt), target, { timeout: 20000 });
+    return (await page.evaluate(() => performance.now())) - t0;
+  }
+  const t1 = await timeJump(60, "orbit");    // cosmos -> orbit (1 altitude)
+  const t2 = await timeJump(120, "reef");    // orbit -> reef (2 altitudes)
+  const ratio = t2 / t1;
+  expect(ratio).toBeGreaterThan(1.5);        // proportional to distance, not a fixed total
+  expect(ratio).toBeLessThan(2.7);           // ~2x, not more
+});
+
+test("a landed clip loops from the morph-tail offset (no jump-back to frame 0)", async ({ page }) => {
+  await boot(page);
+  await enableVideo(page);                                // base loop only loads when video is shown
+  const start = (await page.locator("#scale-name").textContent())!;
+  await wheelOnStage(page, 60);
+  await page.waitForFunction((s) => document.querySelector("#scale-name")?.textContent !== s, start, { timeout: 20000 });
+  // After landing, the dedicated loop element (#vid-loop) is armed (loopTail="1") and
+  // playing from the tail (~3s) — preloaded during the scrub, so the landing was a
+  // source swap, not a reload that restarts at 0.
+  await page.waitForFunction(
+    () => { const v = document.querySelector("#vid-loop") as HTMLVideoElement; return v.dataset.loopTail === "1" && v.currentTime >= 2.5; },
+    null,
+    { timeout: 10000 },
+  );
+  const v = await page.evaluate(() => {
+    const el = document.querySelector("#vid-loop") as HTMLVideoElement;
+    return { t: el.currentTime, loopTail: el.dataset.loopTail, paused: el.paused };
+  });
+  expect(v.loopTail).toBe("1");            // tail-loop armed
+  expect(v.paused).toBe(false);            // the loop is actually playing
+  expect(v.t).toBeGreaterThanOrEqual(2.5); // looping from ~3s, not 0
+});
+
 test("zoom in plays the matching morph, lands locked, and stays put while parked", async ({ page }) => {
   await boot(page);
   const start = (await page.locator("#scale-name").textContent())!;
@@ -57,35 +191,57 @@ test("zoom in plays the matching morph, lands locked, and stays put while parked
   expect((await morphs(page)).length).toBe(countAfterLanding);           // no extra swap
 });
 
-test("zoom back out plays a reverse morph and lands locked", async ({ page }) => {
+test("turn-back scrubs the same morph in reverse and re-locks the start clip", async ({ page }) => {
   await boot(page);
-  const start = (await page.locator("#scale-name").textContent())!;
+  await enableAudio(page);
+  const box = (await page.locator("#dial").boundingBox())!;
+  const cx = box.x + box.width / 2, cy = box.y + box.height / 2;
+  const read = () => page.evaluate(() => ({
+    t: (document.querySelector("video") as HTMLVideoElement).currentTime,
+    ga: (document.querySelector("#aud") as HTMLAudioElement).volume,
+    gb: (document.querySelector("#aud-b") as HTMLAudioElement).volume,
+    name: document.querySelector("#scale-name")?.textContent,
+    morphs: ((window as any).__hefMorphs || []).slice(),
+  }));
 
-  // Zoom in one detent to get off cosmos (-> orbit)...
-  await wheelOnStage(page, 60);
-  await page.waitForFunction(
-    (s) => document.querySelector("#scale-name")?.textContent !== s,
-    start,
-    { timeout: 20_000 },
-  );
-  const atOrbit = (await page.locator("#scale-name").textContent())!;
-  expect(atOrbit).toContain("orbit");
+  await page.mouse.move(cx, cy - 30);
+  await page.mouse.down();
+  await page.mouse.move(cx + 22, cy - 20, { steps: 10 });   // descend partway into the segment
+  await page.waitForFunction(() => (document.querySelector("video") as HTMLVideoElement).currentTime > 0, null, { timeout: 5000 });
+  const fwd = await read();
+  // The single segment morph is the descend/forward file (cosmos__orbit), NOT a `.rev`.
+  expect(fwd.morphs[fwd.morphs.length - 1]).toMatch(/^transitions\/cosmos.*\.mp4$/);
+  expect(fwd.morphs[fwd.morphs.length - 1]).not.toMatch(/\.rev\.mp4$/);
 
-  // ...then zoom back OUT to cosmos.
-  await wheelOnStage(page, -60);
-  await page.waitForFunction(
-    (s) => document.querySelector("#scale-name")?.textContent !== s,
-    atOrbit,
-    { timeout: 20_000 },
-  );
+  await page.mouse.move(cx + 4, cy - 30, { steps: 10 });    // turn back toward the start
+  await page.waitForTimeout(120);                           // let the throttled rAF seek land
+  const back = await read();
+  await page.mouse.up();
 
-  const played = await morphs(page);
-  // The most recent morph is the zoom-out: a `.rev` companion. Its file is named
-  // for the descending pair (cosmos<...>__orbit<...>), so it starts "cosmos".
-  expect(played[played.length - 1]).toMatch(/^transitions\/cosmos.*\.rev\.mp4$/);
-
-  const landed = (await page.locator("#scale-name").textContent())!;
-  expect(landed).toContain("cosmos");
-  await page.waitForTimeout(2500);
-  expect(await page.locator("#scale-name").textContent()).toBe(landed);   // locked
+  expect(back.t).toBeLessThan(fwd.t);          // SAME morph file, seeking backward
+  expect(back.gb).toBeLessThan(fwd.gb);        // next-scale audio receding
+  expect(back.name).toContain("cosmos");       // re-locked the altitude we left
+});
+
+test("crossing a detent commits and locks the destination clip", async ({ page }) => {
+  await boot(page);
+  const box = (await page.locator("#dial").boundingBox())!;
+  const cx = box.x + box.width / 2, cy = box.y + box.height / 2;
+  // Drag clockwise across one full detent (top -> right ~= 90deg = 1.25 detents),
+  // crossing integer 1 (orbit) so it commits, then hold past it (no auto-complete).
+  await page.mouse.move(cx, cy - 30);
+  await page.mouse.down();
+  await page.mouse.move(cx + 30, cy + 6, { steps: 14 });
+  await page.waitForFunction(() => (window as any).__hefState().ringIndex === 1, null, { timeout: 5000 });
+  const st = await page.evaluate(() => (window as any).__hefState());
+  expect(st.ringIndex).toBe(1);                          // committed to orbit
+  expect(String(st.activeClipId)).toMatch(/^orbit/);     // locked the destination pool pick
+  const played = await page.evaluate(() => (window as any).__hefMorphs || []);
+  expect(played[0]).toMatch(/^transitions\/cosmos.*\.mp4$/);
+  expect(played[0]).not.toMatch(/\.rev\.mp4$/);
+  // Hold: the committed clip does not change while parked mid-gesture.
+  await page.waitForTimeout(800);
+  const st2 = await page.evaluate(() => (window as any).__hefState());
+  expect(st2.activeClipId).toBe(st.activeClipId);
+  await page.mouse.up();
 });
diff --git a/simulator/sample_media/reef_snapper/base.mp4 b/simulator/sample_media/reef_snapper/base.mp4
index 123b20b..e2edb52 100644
--- a/simulator/sample_media/reef_snapper/base.mp4
+++ b/simulator/sample_media/reef_snapper/base.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8065f9c714cb6f93cdfd553450ec3b9b8561177537159ea8c7d7ee9d86116e3e
-size 16097053
+oid sha256:6b4d830fa6cf095b10c4f88c0be79733c5f35e0a8e7bbdd8474fe1b656ef3cbb
+size 16840558
diff --git a/simulator/sample_media/transitions/abyss_hiding__cosmos.mp4 b/simulator/sample_media/transitions/abyss_hiding__cosmos.mp4
index c368463..53f6f61 100644
--- a/simulator/sample_media/transitions/abyss_hiding__cosmos.mp4
+++ b/simulator/sample_media/transitions/abyss_hiding__cosmos.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:291e9a9b49c1c7e035126eef7233f5d2e885599837669aa1cb26319564543f86
-size 843244
+oid sha256:c29cceac8742246e90a3f2da94bbcdd6e07a033caa623199680bac93e7add2a8
+size 2732418
diff --git a/simulator/sample_media/transitions/abyss_hiding__cosmos.rev.mp4 b/simulator/sample_media/transitions/abyss_hiding__cosmos.rev.mp4
index fbab731..42180af 100644
--- a/simulator/sample_media/transitions/abyss_hiding__cosmos.rev.mp4
+++ b/simulator/sample_media/transitions/abyss_hiding__cosmos.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:08ab5eada6a5de773a178c2aac2107a98bdd9696fe35a394f02c9451d020071a
-size 819448
+oid sha256:ea4b7aa44b203f0c42ccd2a21fb9ad0b81613023dc983662f6b4cc4a9caeb43a
+size 2641485
diff --git a/simulator/sample_media/transitions/abyss_hiding__cosmos_galaxies.mp4 b/simulator/sample_media/transitions/abyss_hiding__cosmos_galaxies.mp4
index 98dbcfd..d2013bd 100644
--- a/simulator/sample_media/transitions/abyss_hiding__cosmos_galaxies.mp4
+++ b/simulator/sample_media/transitions/abyss_hiding__cosmos_galaxies.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e87d74f2decc3663d7d402d51589e139bb9507abd7b1e6bf3296c1b3537888ef
-size 505426
+oid sha256:c4e8f85c2e2e60f86adf71fa9602e115e5cbcfdf444b7ca7d3fbc2b88bb99102
+size 1940103
diff --git a/simulator/sample_media/transitions/abyss_hiding__cosmos_galaxies.rev.mp4 b/simulator/sample_media/transitions/abyss_hiding__cosmos_galaxies.rev.mp4
index 8c90d59..38a637b 100644
--- a/simulator/sample_media/transitions/abyss_hiding__cosmos_galaxies.rev.mp4
+++ b/simulator/sample_media/transitions/abyss_hiding__cosmos_galaxies.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c62c94332eafc0ac567298a9c3ccfbbc190120caa8f5c9df787d2b621490095e
-size 537718
+oid sha256:17550d25fdebec49a29fe2706eac8b17f7ad0900b05c14e05bc0b18b620fa884
+size 1917871
diff --git a/simulator/sample_media/transitions/abyss_hiding__cosmos_hudf.mp4 b/simulator/sample_media/transitions/abyss_hiding__cosmos_hudf.mp4
index 4a25098..97dcd27 100644
--- a/simulator/sample_media/transitions/abyss_hiding__cosmos_hudf.mp4
+++ b/simulator/sample_media/transitions/abyss_hiding__cosmos_hudf.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:34c9ea4b33180efc59d970aceaae95a42a9975774f67036c4b8f818bb3031831
-size 450363
+oid sha256:7a8c75abf53bd097b8b49f96dae4f19624249e1dc0961bffd7c1ca62870524d8
+size 1757371
diff --git a/simulator/sample_media/transitions/abyss_hiding__cosmos_hudf.rev.mp4 b/simulator/sample_media/transitions/abyss_hiding__cosmos_hudf.rev.mp4
index 08d605b..cb111ec 100644
--- a/simulator/sample_media/transitions/abyss_hiding__cosmos_hudf.rev.mp4
+++ b/simulator/sample_media/transitions/abyss_hiding__cosmos_hudf.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e40deeb50c1e1387a00798d98a0e3b4ef1da049725a6a10346d84a4256271a5
-size 461038
+oid sha256:18066de3ceb3315a6765c9848a6439b8d05f5cc81f6c9cf976e751e18c9509b1
+size 1714094
diff --git a/simulator/sample_media/transitions/abyss_hiding__cosmos_miri.mp4 b/simulator/sample_media/transitions/abyss_hiding__cosmos_miri.mp4
index 1fe026f..084addf 100644
--- a/simulator/sample_media/transitions/abyss_hiding__cosmos_miri.mp4
+++ b/simulator/sample_media/transitions/abyss_hiding__cosmos_miri.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7623313eec50217a254daa8f315ad89c2abfa58c5ff63428b2c5ae146b7b0e08
-size 464592
+oid sha256:a652f2fe608adae2814a28cb0b3886f195bf6b6c4da09647e04883fdd7378691
+size 2264449
diff --git a/simulator/sample_media/transitions/abyss_hiding__cosmos_miri.rev.mp4 b/simulator/sample_media/transitions/abyss_hiding__cosmos_miri.rev.mp4
index d01f70d..c1056ac 100644
--- a/simulator/sample_media/transitions/abyss_hiding__cosmos_miri.rev.mp4
+++ b/simulator/sample_media/transitions/abyss_hiding__cosmos_miri.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:afde67e6e04627f7de68a5159d3814a0a52745ddebf14a2b11f5829f086fe3c3
-size 467870
+oid sha256:c0783e2331ad606d8e6de7ae40b08137a82fc9953f917bb48a63e2f2b0423fa4
+size 2196078
diff --git a/simulator/sample_media/transitions/abyss_hiding__cosmos_xdf.mp4 b/simulator/sample_media/transitions/abyss_hiding__cosmos_xdf.mp4
index d347b96..9a149ed 100644
--- a/simulator/sample_media/transitions/abyss_hiding__cosmos_xdf.mp4
+++ b/simulator/sample_media/transitions/abyss_hiding__cosmos_xdf.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f24d4c54b67194025e150c66baf5b52e02d7900a0296668c29fa7505f6adce7
-size 433100
+oid sha256:eda1b6851e48aab39d3d9653b47bd3c876a7fb7493f3237dc91cce3f6f26d1d5
+size 1472029
diff --git a/simulator/sample_media/transitions/abyss_hiding__cosmos_xdf.rev.mp4 b/simulator/sample_media/transitions/abyss_hiding__cosmos_xdf.rev.mp4
index 888c3ec..dff7735 100644
--- a/simulator/sample_media/transitions/abyss_hiding__cosmos_xdf.rev.mp4
+++ b/simulator/sample_media/transitions/abyss_hiding__cosmos_xdf.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:716a02a217b7462573b47530892397726a050c33116585bed0826fc043b8c99f
-size 455443
+oid sha256:a11e36ba1be3d57bc1fbc289ecd1aaf5fedddeb949537da84a10d28aea57c17f
+size 1453922
diff --git a/simulator/sample_media/transitions/abyss_midwaterexp__cosmos.mp4 b/simulator/sample_media/transitions/abyss_midwaterexp__cosmos.mp4
index a9d0e51..8cfabc7 100644
--- a/simulator/sample_media/transitions/abyss_midwaterexp__cosmos.mp4
+++ b/simulator/sample_media/transitions/abyss_midwaterexp__cosmos.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30aeb7b1bffc6673a5b7e154f66dbc114ab843781dbc916f077f6e16b09b1ef4
-size 980863
+oid sha256:1ad99c85daf75084a23e1bde4a8c38bf99988d303ba31711fd9becf93c250e8f
+size 2931111
diff --git a/simulator/sample_media/transitions/abyss_midwaterexp__cosmos.rev.mp4 b/simulator/sample_media/transitions/abyss_midwaterexp__cosmos.rev.mp4
index 023e6f4..bb83e76 100644
--- a/simulator/sample_media/transitions/abyss_midwaterexp__cosmos.rev.mp4
+++ b/simulator/sample_media/transitions/abyss_midwaterexp__cosmos.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cef3c12880f28f338306117c62a55e75a3f8f2d0ca9c9d42d330fcfca0b4ee9e
-size 963582
+oid sha256:7e9cba48b85e407f8c99c82a5129827243f45c3eb4e3300c54e0d75d588f9503
+size 2830058
diff --git a/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_galaxies.mp4 b/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_galaxies.mp4
index 4630fd6..4e21789 100644
--- a/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_galaxies.mp4
+++ b/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_galaxies.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a01907d7d5c5e7d354d3238353c4c627b5eaa06313f5b34159a66a24eba41b0a
-size 661057
+oid sha256:b1e7b15d16646f4ba6ffe7fe29c73f680044adfa9b696de07aaa0ce2aae74ad6
+size 2119685
diff --git a/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_galaxies.rev.mp4 b/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_galaxies.rev.mp4
index bce9ab6..47258c2 100644
--- a/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_galaxies.rev.mp4
+++ b/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_galaxies.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f58db86af59cfba4eb6a1568453990a408957cd70a4349f15ec5576a39384936
-size 677804
+oid sha256:3aa6df7ed8b201e5796c73f48ac7367b74b8245d2913f51ceab3a7bc83e542af
+size 2089011
diff --git a/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_hudf.mp4 b/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_hudf.mp4
index 3ac93b8..e6f7866 100644
--- a/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_hudf.mp4
+++ b/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_hudf.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:32668039c4ef581a925d6a93619ce8edf7aeabb2fb1e2a06f82b443f134b8e14
-size 571785
+oid sha256:6009932c1bc16f724989902cc9bc6e9281300ef4cfb01da0a0a7bf451aa844e6
+size 1900083
diff --git a/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_hudf.rev.mp4 b/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_hudf.rev.mp4
index 4347b89..3fd036f 100644
--- a/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_hudf.rev.mp4
+++ b/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_hudf.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b290c5b3870d8187952a14b5722a01e50c20e383fea4bccbc43fc6f14dca6219
-size 578810
+oid sha256:d4643e52b60abe2a851576ba19df59f80ea8966392316faa220c03ea6c9ac919
+size 1849424
diff --git a/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_miri.mp4 b/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_miri.mp4
index 40abf45..fef41c1 100644
--- a/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_miri.mp4
+++ b/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_miri.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b2796097643d18bae8587083059f99ea2e2db978065ba378b528b81188781319
-size 612704
+oid sha256:da8e0427e080fbbfe40df51a15a6cd091866e55e6981aa39553de4b1ce5a0838
+size 2455962
diff --git a/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_miri.rev.mp4 b/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_miri.rev.mp4
index fda4fde..7b46a30 100644
--- a/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_miri.rev.mp4
+++ b/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_miri.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:03c445bd6ea3625a7699f6e9cc02adbf7603ba1f9a3ec31e8a83c87c786ff6dd
-size 603290
+oid sha256:2c12697af99875316a7a6deddd42f0e913094f1fb31c93505bd763730e48c041
+size 2375222
diff --git a/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_xdf.mp4 b/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_xdf.mp4
index ed91e79..3dde539 100644
--- a/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_xdf.mp4
+++ b/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_xdf.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ceeeac3a8434c77da88aca6bb0d15ca749dc8a4690e082d7e6bb6a58dd22983
-size 556503
+oid sha256:cbefe4df2f72460cebd343b663699ed109420cabb07a3227686ac4b7c92c8c8e
+size 1631230
diff --git a/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_xdf.rev.mp4 b/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_xdf.rev.mp4
index 551e34d..9016b2f 100644
--- a/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_xdf.rev.mp4
+++ b/simulator/sample_media/transitions/abyss_midwaterexp__cosmos_xdf.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:442c399b53966b57f079b7a440ed7d58165f3a60dedc5e03483c7609a655ee7c
-size 573379
+oid sha256:522bbe7f21242eb80557d4d4a92c5fcab1764e85a201d91699e7d83dbe876a60
+size 1602454
diff --git a/simulator/sample_media/transitions/abyss_wow__cosmos.mp4 b/simulator/sample_media/transitions/abyss_wow__cosmos.mp4
index 739eb0e..b52b210 100644
--- a/simulator/sample_media/transitions/abyss_wow__cosmos.mp4
+++ b/simulator/sample_media/transitions/abyss_wow__cosmos.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bf16bb3ef9da4c5ab23f04df250cf17eff2b27bc79497ed2a84f83f87d9c0a8
-size 842223
+oid sha256:c1065fcacef3ad7a9bea70d4723115241a77aa4e20ccd1ab9fde0a44a30de748
+size 2816019
diff --git a/simulator/sample_media/transitions/abyss_wow__cosmos.rev.mp4 b/simulator/sample_media/transitions/abyss_wow__cosmos.rev.mp4
index 083e898..b5eb4e5 100644
--- a/simulator/sample_media/transitions/abyss_wow__cosmos.rev.mp4
+++ b/simulator/sample_media/transitions/abyss_wow__cosmos.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a26772d6d744c5d6c2c8e42e07fa62ac1bc4015a6747e9d709219a14e2dbe21
-size 842778
+oid sha256:f02a9518dc79d37b21e82563517e55e7186c8af562c331cf5d591bc65fe119b4
+size 2706807
diff --git a/simulator/sample_media/transitions/abyss_wow__cosmos_galaxies.mp4 b/simulator/sample_media/transitions/abyss_wow__cosmos_galaxies.mp4
index 139bff0..046e142 100644
--- a/simulator/sample_media/transitions/abyss_wow__cosmos_galaxies.mp4
+++ b/simulator/sample_media/transitions/abyss_wow__cosmos_galaxies.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:730adc9a9dd9146ee7f397e03cb64163fe6b77effd3f483334de76db893e9bed
-size 521206
+oid sha256:b1c06b4fbc53f894ce61e86d39e59f6b2ee7ab2d58cb2b4c4b42c63e7768d984
+size 2023021
diff --git a/simulator/sample_media/transitions/abyss_wow__cosmos_galaxies.rev.mp4 b/simulator/sample_media/transitions/abyss_wow__cosmos_galaxies.rev.mp4
index 2750f47..3fb1fa3 100644
--- a/simulator/sample_media/transitions/abyss_wow__cosmos_galaxies.rev.mp4
+++ b/simulator/sample_media/transitions/abyss_wow__cosmos_galaxies.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a0892d62743fc3144ad91a0e2bbc37a6857b6c246c8866a8140ba63eb3b65e8
-size 537054
+oid sha256:a954bddd349a6393ec7aaf81da5d9970bf0a2a523f915768be4a9eea0535dbdb
+size 1982818
diff --git a/simulator/sample_media/transitions/abyss_wow__cosmos_hudf.mp4 b/simulator/sample_media/transitions/abyss_wow__cosmos_hudf.mp4
index 371c3b7..1d0c862 100644
--- a/simulator/sample_media/transitions/abyss_wow__cosmos_hudf.mp4
+++ b/simulator/sample_media/transitions/abyss_wow__cosmos_hudf.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12b79343076f021aea635558d311e710453876d4a4cf514acaf79273df3a36ae
-size 451792
+oid sha256:ff5566669521560fc419f52c5eda0f16cd5db1750b968a3926fba4c7f95420da
+size 1832773
diff --git a/simulator/sample_media/transitions/abyss_wow__cosmos_hudf.rev.mp4 b/simulator/sample_media/transitions/abyss_wow__cosmos_hudf.rev.mp4
index 04ec962..fb9a0ad 100644
--- a/simulator/sample_media/transitions/abyss_wow__cosmos_hudf.rev.mp4
+++ b/simulator/sample_media/transitions/abyss_wow__cosmos_hudf.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8edd2f6db1b4b62046a1f671cfaedbc9cb08b2dfdc18a5abb8fd152109fa732c
-size 448837
+oid sha256:00b06f4f0928a20515ce16c0ea36a59021d97858f9e7961e1f1f57eb14722dc7
+size 1771991
diff --git a/simulator/sample_media/transitions/abyss_wow__cosmos_miri.mp4 b/simulator/sample_media/transitions/abyss_wow__cosmos_miri.mp4
index f1d9bc7..3ed68c4 100644
--- a/simulator/sample_media/transitions/abyss_wow__cosmos_miri.mp4
+++ b/simulator/sample_media/transitions/abyss_wow__cosmos_miri.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:016b4ec9dead8f4aded0e89881604461e426a68e28d3b16245b2ee057302a935
-size 474698
+oid sha256:36fb445b90d68b34d43a808833b2715a658f903606bd96ec03ac9355c2725f48
+size 2347114
diff --git a/simulator/sample_media/transitions/abyss_wow__cosmos_miri.rev.mp4 b/simulator/sample_media/transitions/abyss_wow__cosmos_miri.rev.mp4
index a10ab68..946c6f1 100644
--- a/simulator/sample_media/transitions/abyss_wow__cosmos_miri.rev.mp4
+++ b/simulator/sample_media/transitions/abyss_wow__cosmos_miri.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:264f676fe0c5cd460539400baf95bfdd9149c514fc059e243ffa6dee0e84316a
-size 470348
+oid sha256:8fe136975066a6430f7a00dcc5387b33ffcf3dd0b29e7658b8d62136c04660fd
+size 2259661
diff --git a/simulator/sample_media/transitions/abyss_wow__cosmos_xdf.mp4 b/simulator/sample_media/transitions/abyss_wow__cosmos_xdf.mp4
index 94c3227..e10879d 100644
--- a/simulator/sample_media/transitions/abyss_wow__cosmos_xdf.mp4
+++ b/simulator/sample_media/transitions/abyss_wow__cosmos_xdf.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7867c813a37f8fbf6c6612620c107cb72c3ac2390e5172442ded19c9e6c1ea52
-size 422205
+oid sha256:c2e16aa9b5632a495dc7bec1d3ee685dde29df2e65c1e230a04e658c4f14c596
+size 1551555
diff --git a/simulator/sample_media/transitions/abyss_wow__cosmos_xdf.rev.mp4 b/simulator/sample_media/transitions/abyss_wow__cosmos_xdf.rev.mp4
index 667d6a2..b41185f 100644
--- a/simulator/sample_media/transitions/abyss_wow__cosmos_xdf.rev.mp4
+++ b/simulator/sample_media/transitions/abyss_wow__cosmos_xdf.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c62c09c66dbe3c6fa0878fb7a404686019f70ba8ff504ad290bc5b25fef06984
-size 440366
+oid sha256:ae13e6c576cb4bf69809175670414c0220607c5d288cd4975faa2ba210c2deea
+size 1515061
diff --git a/simulator/sample_media/transitions/coast_birdrock__reef_coralspacific.mp4 b/simulator/sample_media/transitions/coast_birdrock__reef_coralspacific.mp4
index 63fc06a..d9f4f61 100644
--- a/simulator/sample_media/transitions/coast_birdrock__reef_coralspacific.mp4
+++ b/simulator/sample_media/transitions/coast_birdrock__reef_coralspacific.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b09e34d10532580647c4305a8d6765e25428d91eb2fdd1d2051b74820a1d7ef3
-size 2303503
+oid sha256:2a193a2084832a2ea9c38f1048ac8f6fdbd3ec0c8cc414adb89b9439916ae368
+size 4105105
diff --git a/simulator/sample_media/transitions/coast_birdrock__reef_coralspacific.rev.mp4 b/simulator/sample_media/transitions/coast_birdrock__reef_coralspacific.rev.mp4
index c65a603..e92647d 100644
--- a/simulator/sample_media/transitions/coast_birdrock__reef_coralspacific.rev.mp4
+++ b/simulator/sample_media/transitions/coast_birdrock__reef_coralspacific.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2784db4a084d5120e2e11efaf3404a408d74d515e9bada91036b50a66b3ffe1
-size 2121342
+oid sha256:4cd23a678c887dcfefc36047188b32a395415f4f2b55da7aaa507ba30869ef31
+size 3854141
diff --git a/simulator/sample_media/transitions/coast_birdrock__reef_hawkfish.mp4 b/simulator/sample_media/transitions/coast_birdrock__reef_hawkfish.mp4
index 6fcbc3f..2c09381 100644
--- a/simulator/sample_media/transitions/coast_birdrock__reef_hawkfish.mp4
+++ b/simulator/sample_media/transitions/coast_birdrock__reef_hawkfish.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b25edcbd9c4f6d2c75bbd14a18ab0aa614be1d561ca14bd33e3278a360b12e80
-size 2311391
+oid sha256:f82148241234d0121b0775d4e68d96803b5be6fa21ab727877b79307ff57ecdf
+size 4045139
diff --git a/simulator/sample_media/transitions/coast_birdrock__reef_hawkfish.rev.mp4 b/simulator/sample_media/transitions/coast_birdrock__reef_hawkfish.rev.mp4
index 21cebb8..e168947 100644
--- a/simulator/sample_media/transitions/coast_birdrock__reef_hawkfish.rev.mp4
+++ b/simulator/sample_media/transitions/coast_birdrock__reef_hawkfish.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f7f24be1142ab948652ec1fcdb3d9cd62f1dcfacbeb0a17a9e76e1aad736ae1
-size 2179717
+oid sha256:8516b7d060f1090f7865b0a9fb93a725fa9acf1d05671f35c4614aa3b7418d84
+size 3784320
diff --git a/simulator/sample_media/transitions/coast_birdrock__reef_lionfish.mp4 b/simulator/sample_media/transitions/coast_birdrock__reef_lionfish.mp4
index 906fd92..284a908 100644
--- a/simulator/sample_media/transitions/coast_birdrock__reef_lionfish.mp4
+++ b/simulator/sample_media/transitions/coast_birdrock__reef_lionfish.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:302cc7225f1183b63e85b99e4527ddfc0e899cba748116a22158487ab5e5aaca
-size 2248085
+oid sha256:59233c75513083d1fb4759b8814c64b68a912b802ad91ad4a9c26cf239618c94
+size 3864240
diff --git a/simulator/sample_media/transitions/coast_birdrock__reef_lionfish.rev.mp4 b/simulator/sample_media/transitions/coast_birdrock__reef_lionfish.rev.mp4
index 66b3c34..a78530c 100644
--- a/simulator/sample_media/transitions/coast_birdrock__reef_lionfish.rev.mp4
+++ b/simulator/sample_media/transitions/coast_birdrock__reef_lionfish.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef75d3a5720f9f2b1b6038b2acf6493d151ba9d9b37965b1728c0eab18393414
-size 2097737
+oid sha256:d22584a4883f488c5b8d265c6b01435da895f663042e739b208266ad4ec2ae4d
+size 3603444
diff --git a/simulator/sample_media/transitions/coast_birdrock__reef_snapper.mp4 b/simulator/sample_media/transitions/coast_birdrock__reef_snapper.mp4
index a10c9a0..aeb3e05 100644
--- a/simulator/sample_media/transitions/coast_birdrock__reef_snapper.mp4
+++ b/simulator/sample_media/transitions/coast_birdrock__reef_snapper.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ade7fb14fd1a742b23da8e027d5c9b2c431104dcb6437b27b0beec322be2733
-size 1839974
+oid sha256:fccaf9e55681b21204be4972ef3b9d25cb1a94725055d49ed5d59840aec72ad7
+size 3363282
diff --git a/simulator/sample_media/transitions/coast_birdrock__reef_snapper.rev.mp4 b/simulator/sample_media/transitions/coast_birdrock__reef_snapper.rev.mp4
index 8e451b6..2097e26 100644
--- a/simulator/sample_media/transitions/coast_birdrock__reef_snapper.rev.mp4
+++ b/simulator/sample_media/transitions/coast_birdrock__reef_snapper.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d89990d9b5742aba15f8e1c12d9b9bb952da47d17a798dfceec0c3a55713cdb
-size 1693010
+oid sha256:77adc24d12d6a139fa3147e3cb4d787e2d0e43335aa764b6d54d0f2ee749d552
+size 3141888
diff --git a/simulator/sample_media/transitions/coast_birdrock__reef_spawning.mp4 b/simulator/sample_media/transitions/coast_birdrock__reef_spawning.mp4
index 1572150..90e2065 100644
--- a/simulator/sample_media/transitions/coast_birdrock__reef_spawning.mp4
+++ b/simulator/sample_media/transitions/coast_birdrock__reef_spawning.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd87726a64e6a82738836034aa8ba8c1f45297e7433c40f191638996daa6e306
-size 2554098
+oid sha256:1dc6d929264dfefbdde61b4a654fcb3fef510df2267d30da724358167493f705
+size 3880080
diff --git a/simulator/sample_media/transitions/coast_birdrock__reef_spawning.rev.mp4 b/simulator/sample_media/transitions/coast_birdrock__reef_spawning.rev.mp4
index c4dbf5a..2fd1b75 100644
--- a/simulator/sample_media/transitions/coast_birdrock__reef_spawning.rev.mp4
+++ b/simulator/sample_media/transitions/coast_birdrock__reef_spawning.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa7058612fd41eeb83a8bc93d10974c7929157abcae68208fd4bc6b4cf1b5119
-size 2436070
+oid sha256:2b017c77551d855c705a4151cbe7508b3ca7c2649a2b9d4050d90b6ae4361488
+size 3623925
diff --git a/simulator/sample_media/transitions/coast_drakesbeach__reef_coralspacific.mp4 b/simulator/sample_media/transitions/coast_drakesbeach__reef_coralspacific.mp4
index 873197e..e17afb6 100644
--- a/simulator/sample_media/transitions/coast_drakesbeach__reef_coralspacific.mp4
+++ b/simulator/sample_media/transitions/coast_drakesbeach__reef_coralspacific.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8479a7ef72aec2a1046b763b1ea158c0bab34c03117a2ce6522fe2690c729340
-size 1173420
+oid sha256:394377d7f19e3d69834c355351e31530d61966f34bb97709858668ffb315e599
+size 3351670
diff --git a/simulator/sample_media/transitions/coast_drakesbeach__reef_coralspacific.rev.mp4 b/simulator/sample_media/transitions/coast_drakesbeach__reef_coralspacific.rev.mp4
index de5f136..993a9cf 100644
--- a/simulator/sample_media/transitions/coast_drakesbeach__reef_coralspacific.rev.mp4
+++ b/simulator/sample_media/transitions/coast_drakesbeach__reef_coralspacific.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:426d3dd7790e33d17e9e88a70f809364c3dbc9e22018587cb7bf4965d143908f
-size 1130786
+oid sha256:014317eb544b3d5e336d02d6bbeb98425e3656cc47c607bbf7ad65fdfc269895
+size 3150742
diff --git a/simulator/sample_media/transitions/coast_drakesbeach__reef_hawkfish.mp4 b/simulator/sample_media/transitions/coast_drakesbeach__reef_hawkfish.mp4
index 66f5119..b831bf7 100644
--- a/simulator/sample_media/transitions/coast_drakesbeach__reef_hawkfish.mp4
+++ b/simulator/sample_media/transitions/coast_drakesbeach__reef_hawkfish.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11252aa99f2a9545a6f632013a083d71a934d296deffb9ad69ac019d619f8e20
-size 1202782
+oid sha256:5a1bf623701884209888c0bf8ec4e0484fd3ef0c80ce0295e35a5849c01515ea
+size 3287698
diff --git a/simulator/sample_media/transitions/coast_drakesbeach__reef_hawkfish.rev.mp4 b/simulator/sample_media/transitions/coast_drakesbeach__reef_hawkfish.rev.mp4
index 0915ac6..e10d6fb 100644
--- a/simulator/sample_media/transitions/coast_drakesbeach__reef_hawkfish.rev.mp4
+++ b/simulator/sample_media/transitions/coast_drakesbeach__reef_hawkfish.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a074ed2bc5077acc9553fafdd4c96eafd0413e3b66b5bf6064382a0db261877d
-size 1198508
+oid sha256:31ea96afbb541e488194e611a176c57dec3169264401e37a505d113efe61d929
+size 3076882
diff --git a/simulator/sample_media/transitions/coast_drakesbeach__reef_lionfish.mp4 b/simulator/sample_media/transitions/coast_drakesbeach__reef_lionfish.mp4
index a0a65ee..87deefa 100644
--- a/simulator/sample_media/transitions/coast_drakesbeach__reef_lionfish.mp4
+++ b/simulator/sample_media/transitions/coast_drakesbeach__reef_lionfish.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7ca96ce8c1465ef720cdb01381305fce5fc54796318571a9dd348bc52f91a87
-size 1149126
+oid sha256:95adb9b7259ce2e6a63fc3d57578ad0e29de7f1ca2f48b8a9cb098672ce00970
+size 3100179
diff --git a/simulator/sample_media/transitions/coast_drakesbeach__reef_lionfish.rev.mp4 b/simulator/sample_media/transitions/coast_drakesbeach__reef_lionfish.rev.mp4
index 2ce1054..e6c54b1 100644
--- a/simulator/sample_media/transitions/coast_drakesbeach__reef_lionfish.rev.mp4
+++ b/simulator/sample_media/transitions/coast_drakesbeach__reef_lionfish.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66a6831b07f025f5377f956ff8bbd347655a7a4b7d5bce9a6216278982f1dca5
-size 1145728
+oid sha256:6e30fb3b686742f0951d799c7f0e89eaaaa2d3adbce1e18eff2d503acc8df0b9
+size 2888711
diff --git a/simulator/sample_media/transitions/coast_drakesbeach__reef_snapper.mp4 b/simulator/sample_media/transitions/coast_drakesbeach__reef_snapper.mp4
index e8f60d3..d5c1637 100644
--- a/simulator/sample_media/transitions/coast_drakesbeach__reef_snapper.mp4
+++ b/simulator/sample_media/transitions/coast_drakesbeach__reef_snapper.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:97d46eb801df74e27d180ce4bcdf5ce332b0a83731e4184f493f1d3bc9cd4b0d
-size 738648
+oid sha256:79479b960786e80ca017a356a1ea166ad90c5fb09f14c4df09fde48cf8745307
+size 2605863
diff --git a/simulator/sample_media/transitions/coast_drakesbeach__reef_snapper.rev.mp4 b/simulator/sample_media/transitions/coast_drakesbeach__reef_snapper.rev.mp4
index 8e73940..9a2bc39 100644
--- a/simulator/sample_media/transitions/coast_drakesbeach__reef_snapper.rev.mp4
+++ b/simulator/sample_media/transitions/coast_drakesbeach__reef_snapper.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cd34adceffc8b6fd91e2c36fc7456ff65de2bd8153dd82baafdd6e9150f21074
-size 734335
+oid sha256:04fdc70375c9a1218ed84aa577e10c1c12025d1546c7cc60d9963bcb6da3b793
+size 2435172
diff --git a/simulator/sample_media/transitions/coast_drakesbeach__reef_spawning.mp4 b/simulator/sample_media/transitions/coast_drakesbeach__reef_spawning.mp4
index ec14a27..3dda805 100644
--- a/simulator/sample_media/transitions/coast_drakesbeach__reef_spawning.mp4
+++ b/simulator/sample_media/transitions/coast_drakesbeach__reef_spawning.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:118cd138b2f4e39aaee3d5376854c325509ea640ecd6ed668285b194b53e8017
-size 1443408
+oid sha256:c2dfb9ebf21d806643f976c4b464c01de7ed1e80fcffedab1fea9eb249b852ca
+size 3126330
diff --git a/simulator/sample_media/transitions/coast_drakesbeach__reef_spawning.rev.mp4 b/simulator/sample_media/transitions/coast_drakesbeach__reef_spawning.rev.mp4
index db56292..f9afac0 100644
--- a/simulator/sample_media/transitions/coast_drakesbeach__reef_spawning.rev.mp4
+++ b/simulator/sample_media/transitions/coast_drakesbeach__reef_spawning.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:acce8f74f839fb208829bb6454396d5d4d5bd357d4a24f1a9bf86414bdef18c4
-size 1479041
+oid sha256:2667dcb5e08ebc1e510fd78ada87b2b712437e256b422aeaedf378647280f1bb
+size 2919616
diff --git a/simulator/sample_media/transitions/coast_elkbeach__reef_coralspacific.mp4 b/simulator/sample_media/transitions/coast_elkbeach__reef_coralspacific.mp4
index 9ae0d4a..b8b2813 100644
--- a/simulator/sample_media/transitions/coast_elkbeach__reef_coralspacific.mp4
+++ b/simulator/sample_media/transitions/coast_elkbeach__reef_coralspacific.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:27c15b08d20fccbbd75f990d75f0307b94df128851389a0310b3d5af0b373852
-size 1113762
+oid sha256:ef530ed21dee399dab9fcb5b2213eb9ea5676882bb498673cbabc6e07b463c03
+size 3308751
diff --git a/simulator/sample_media/transitions/coast_elkbeach__reef_coralspacific.rev.mp4 b/simulator/sample_media/transitions/coast_elkbeach__reef_coralspacific.rev.mp4
index c5ff9b0..70405f4 100644
--- a/simulator/sample_media/transitions/coast_elkbeach__reef_coralspacific.rev.mp4
+++ b/simulator/sample_media/transitions/coast_elkbeach__reef_coralspacific.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a5d8581ba202aed8c8cfebb4dfea651d258dd457099a249f3bfe385a313080c
-size 1073398
+oid sha256:93c328dc1be38c666e596832b25079400132b80450759dc99da64079afb2e1b8
+size 3128104
diff --git a/simulator/sample_media/transitions/coast_elkbeach__reef_hawkfish.mp4 b/simulator/sample_media/transitions/coast_elkbeach__reef_hawkfish.mp4
index 54a937c..444f6ee 100644
--- a/simulator/sample_media/transitions/coast_elkbeach__reef_hawkfish.mp4
+++ b/simulator/sample_media/transitions/coast_elkbeach__reef_hawkfish.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b72d560a0f5f43e0dded8ec57fa6e368c149278cf369a6184507d12fe000bd0d
-size 1139285
+oid sha256:ae0f51b6ec2a5337e0e0a0ef2d397b5ae12cead7261404f5c119b4ef4170771f
+size 3243745
diff --git a/simulator/sample_media/transitions/coast_elkbeach__reef_hawkfish.rev.mp4 b/simulator/sample_media/transitions/coast_elkbeach__reef_hawkfish.rev.mp4
index bd4ad79..c64397e 100644
--- a/simulator/sample_media/transitions/coast_elkbeach__reef_hawkfish.rev.mp4
+++ b/simulator/sample_media/transitions/coast_elkbeach__reef_hawkfish.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e4e1f6b50b2c45da8ca6821f69881d1402d7264114531953f5f27fbd0a7980a
-size 1144439
+oid sha256:7452fbcd170f7df024b03925d64b2b9ae63bce84b2158952d51297a45a199ce6
+size 3053206
diff --git a/simulator/sample_media/transitions/coast_elkbeach__reef_lionfish.mp4 b/simulator/sample_media/transitions/coast_elkbeach__reef_lionfish.mp4
index 95c2ca9..5e5ba1f 100644
--- a/simulator/sample_media/transitions/coast_elkbeach__reef_lionfish.mp4
+++ b/simulator/sample_media/transitions/coast_elkbeach__reef_lionfish.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d396a68cb8e8f34f27dce06e1404cf04898eda35577d69495d5edb9a6627c972
-size 1078555
+oid sha256:ab137f9f4af9227f9d515b48dc2630d3fe04a32c5782bf42628099763e7d0576
+size 3061971
diff --git a/simulator/sample_media/transitions/coast_elkbeach__reef_lionfish.rev.mp4 b/simulator/sample_media/transitions/coast_elkbeach__reef_lionfish.rev.mp4
index ced4dc2..eb11a60 100644
--- a/simulator/sample_media/transitions/coast_elkbeach__reef_lionfish.rev.mp4
+++ b/simulator/sample_media/transitions/coast_elkbeach__reef_lionfish.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ccaa5af5349e1bf71ffb722db998eab3a1d0f9d14e5c93ea6908e96045c937f7
-size 1081423
+oid sha256:80f647d9d18560dbe8ebe186fbac3b2108244fb89ca56035c35329804762af1c
+size 2871299
diff --git a/simulator/sample_media/transitions/coast_elkbeach__reef_snapper.mp4 b/simulator/sample_media/transitions/coast_elkbeach__reef_snapper.mp4
index 3c78d55..2557478 100644
--- a/simulator/sample_media/transitions/coast_elkbeach__reef_snapper.mp4
+++ b/simulator/sample_media/transitions/coast_elkbeach__reef_snapper.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:194bc013726a17494996c7290f9c64a95c2b28b44a000c2e96a19bcab572195a
-size 682535
+oid sha256:3be5c980a14c47bb4f3aebe13608648ba0d539977f03151be177c6c73b578006
+size 2565718
diff --git a/simulator/sample_media/transitions/coast_elkbeach__reef_snapper.rev.mp4 b/simulator/sample_media/transitions/coast_elkbeach__reef_snapper.rev.mp4
index e794603..4ed23cc 100644
--- a/simulator/sample_media/transitions/coast_elkbeach__reef_snapper.rev.mp4
+++ b/simulator/sample_media/transitions/coast_elkbeach__reef_snapper.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:39c5e4ea04b7a3d704e5f0a6f03574e403c744392b944feb1e293fdd3cf557d3
-size 675440
+oid sha256:87b1d5b497108f5b91298fc7c1a6042a5b634b103976fadb84e99cc087ece3a2
+size 2414741
diff --git a/simulator/sample_media/transitions/coast_elkbeach__reef_spawning.mp4 b/simulator/sample_media/transitions/coast_elkbeach__reef_spawning.mp4
index 5c931cd..d7e286e 100644
--- a/simulator/sample_media/transitions/coast_elkbeach__reef_spawning.mp4
+++ b/simulator/sample_media/transitions/coast_elkbeach__reef_spawning.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c4237f406784fc9855f3b92cd0dd37b0279877f456c8190bbc17b2143f8a6b08
-size 1391578
+oid sha256:8619c708cec53ff51bb372c1d12fa5cb2a949265ad973be88307a1d01110ed81
+size 3080426
diff --git a/simulator/sample_media/transitions/coast_elkbeach__reef_spawning.rev.mp4 b/simulator/sample_media/transitions/coast_elkbeach__reef_spawning.rev.mp4
index 3b96d59..da1ef37 100644
--- a/simulator/sample_media/transitions/coast_elkbeach__reef_spawning.rev.mp4
+++ b/simulator/sample_media/transitions/coast_elkbeach__reef_spawning.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b73cd52f3a6034d1fc5f3fab5bd7b6a0c50c20e332e528c91b097e3f06936dea
-size 1414944
+oid sha256:8024a49b84d60592fc049ce04ca77d8cabb51cb10d58f3f57f5838cf6e4d1be5
+size 2894354
diff --git a/simulator/sample_media/transitions/coast_surfgrass__reef_coralspacific.mp4 b/simulator/sample_media/transitions/coast_surfgrass__reef_coralspacific.mp4
index f06ac27..493015f 100644
--- a/simulator/sample_media/transitions/coast_surfgrass__reef_coralspacific.mp4
+++ b/simulator/sample_media/transitions/coast_surfgrass__reef_coralspacific.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31be7ff08ffc85d40a42031721c0203b2e6de4ce02de02b9f3afb3db83ef4040
-size 1898748
+oid sha256:2e7eb0b318a28a60c9f26562d46372e985ea7eb8c104bc231c4182186d1e2da5
+size 4973652
diff --git a/simulator/sample_media/transitions/coast_surfgrass__reef_coralspacific.rev.mp4 b/simulator/sample_media/transitions/coast_surfgrass__reef_coralspacific.rev.mp4
index 2a4bd7e..f0057da 100644
--- a/simulator/sample_media/transitions/coast_surfgrass__reef_coralspacific.rev.mp4
+++ b/simulator/sample_media/transitions/coast_surfgrass__reef_coralspacific.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:01ffe9f249bae992ef6f1c3cb3f0cf81be63d040d61025d039c07b61287a2173
-size 1912688
+oid sha256:7a0ae6c24195ba92092d20b60f25a7dd9f9ac8b6a5243e10a3db6b26f233955b
+size 4617676
diff --git a/simulator/sample_media/transitions/coast_surfgrass__reef_hawkfish.mp4 b/simulator/sample_media/transitions/coast_surfgrass__reef_hawkfish.mp4
index 2bba731..f8abe72 100644
--- a/simulator/sample_media/transitions/coast_surfgrass__reef_hawkfish.mp4
+++ b/simulator/sample_media/transitions/coast_surfgrass__reef_hawkfish.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:57bc27ab64221c73365069e61314a40195d3a4af93d71a00534e8053fa5bd382
-size 1929671
+oid sha256:b8d9f210f49b8048d74e3abef58840a997dfe3a349ba9cedaac8f72e1687b29c
+size 4915819
diff --git a/simulator/sample_media/transitions/coast_surfgrass__reef_hawkfish.rev.mp4 b/simulator/sample_media/transitions/coast_surfgrass__reef_hawkfish.rev.mp4
index ea3c008..19909a1 100644
--- a/simulator/sample_media/transitions/coast_surfgrass__reef_hawkfish.rev.mp4
+++ b/simulator/sample_media/transitions/coast_surfgrass__reef_hawkfish.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8cb468af2baf0f9c765bb17c2e75d8c2a08d1b634632aadbc80578a06dad437d
-size 1979328
+oid sha256:e3502d03472b4375b03c4411e43bbe1aae887b8351f27bed82d9ce0b787fd58d
+size 4550042
diff --git a/simulator/sample_media/transitions/coast_surfgrass__reef_lionfish.mp4 b/simulator/sample_media/transitions/coast_surfgrass__reef_lionfish.mp4
index b482d65..35519f3 100644
--- a/simulator/sample_media/transitions/coast_surfgrass__reef_lionfish.mp4
+++ b/simulator/sample_media/transitions/coast_surfgrass__reef_lionfish.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80f7cb1da0bec9e3bc574ec3f7e80029a936b1ce2e64e0f8cac456627af88405
-size 1865601
+oid sha256:7ed5ecdeec597fdc5ac44ea446d633ed07ab0b187d142bf54bd5ab62b7c1d06c
+size 4729956
diff --git a/simulator/sample_media/transitions/coast_surfgrass__reef_lionfish.rev.mp4 b/simulator/sample_media/transitions/coast_surfgrass__reef_lionfish.rev.mp4
index d1be822..2676e7d 100644
--- a/simulator/sample_media/transitions/coast_surfgrass__reef_lionfish.rev.mp4
+++ b/simulator/sample_media/transitions/coast_surfgrass__reef_lionfish.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8497c5295d0628cce6e5fde4d1122859a15631ee751b23eededc1a373b65079a
-size 1916966
+oid sha256:89f0f034977544749b8e61d0e7d0d18fa36996c8c0e2753c5ac0159750c8c59f
+size 4364275
diff --git a/simulator/sample_media/transitions/coast_surfgrass__reef_snapper.mp4 b/simulator/sample_media/transitions/coast_surfgrass__reef_snapper.mp4
index 2ec949f..0894c29 100644
--- a/simulator/sample_media/transitions/coast_surfgrass__reef_snapper.mp4
+++ b/simulator/sample_media/transitions/coast_surfgrass__reef_snapper.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:177a69dfe67d329b26fb54007e9dde192a28fe0faf5061e1f2773a12ea5c3bb3
-size 1471632
+oid sha256:679f7f363d6af738994a67d8af650de97378b1d1012890874e4158fb1e9290a9
+size 4234117
diff --git a/simulator/sample_media/transitions/coast_surfgrass__reef_snapper.rev.mp4 b/simulator/sample_media/transitions/coast_surfgrass__reef_snapper.rev.mp4
index cda87d9..e8851af 100644
--- a/simulator/sample_media/transitions/coast_surfgrass__reef_snapper.rev.mp4
+++ b/simulator/sample_media/transitions/coast_surfgrass__reef_snapper.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:40d2580a13eeb571e3689fb7153b78a5fd636d1d3ef8355f46b7eb2a82e47c46
-size 1511183
+oid sha256:45517d3995b4158a21b1cf2681bebb832dacc9112fcc56cef28e2c844f5eb054
+size 3908303
diff --git a/simulator/sample_media/transitions/coast_surfgrass__reef_spawning.mp4 b/simulator/sample_media/transitions/coast_surfgrass__reef_spawning.mp4
index d3e72b7..fbef9a9 100644
--- a/simulator/sample_media/transitions/coast_surfgrass__reef_spawning.mp4
+++ b/simulator/sample_media/transitions/coast_surfgrass__reef_spawning.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:76cdd3ca6eeee7ef41f2561493256470cdfc756ee3482307736fb01c140e5763
-size 2171735
+oid sha256:44fe07d21c0168d708379b164bb5c2c342cfe98e54cb4435744a9d5d8fe65a5e
+size 4749857
diff --git a/simulator/sample_media/transitions/coast_surfgrass__reef_spawning.rev.mp4 b/simulator/sample_media/transitions/coast_surfgrass__reef_spawning.rev.mp4
index dbcae2e..9c83018 100644
--- a/simulator/sample_media/transitions/coast_surfgrass__reef_spawning.rev.mp4
+++ b/simulator/sample_media/transitions/coast_surfgrass__reef_spawning.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:79da9ac4af2926cab4fd754d2facb46b7990c6d02e0bb79e41a67a4668a988df
-size 2261422
+oid sha256:0f97528a8b341ba740c7e38be5475e13fd83fb50a68bc3d274d4d1ac0cc49ff2
+size 4388652
diff --git a/simulator/sample_media/transitions/cosmos__orbit_bluemarble.mp4 b/simulator/sample_media/transitions/cosmos__orbit_bluemarble.mp4
index 0be7d5f..56acf8e 100644
--- a/simulator/sample_media/transitions/cosmos__orbit_bluemarble.mp4
+++ b/simulator/sample_media/transitions/cosmos__orbit_bluemarble.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d9302fb885b47f7e62ddb020e2fa64e7165c2da8ebb49dd3ef555d9c0be78b1d
-size 1169025
+oid sha256:dce00e9b36fc6063957264b79e71a2805fe2877e414e385b56c7c8625c29bb7c
+size 3667164
diff --git a/simulator/sample_media/transitions/cosmos__orbit_bluemarble.rev.mp4 b/simulator/sample_media/transitions/cosmos__orbit_bluemarble.rev.mp4
index f26d0d2..de172ef 100644
--- a/simulator/sample_media/transitions/cosmos__orbit_bluemarble.rev.mp4
+++ b/simulator/sample_media/transitions/cosmos__orbit_bluemarble.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1a178192f74740e142aad4aefc5663a9ba81da2c520e4510912f2c8fd8b44a5
-size 1093876
+oid sha256:bda42e51d53f5c94db5b8566376f0a9bd7330a68dee299c164a3c6214641edc6
+size 3498880
diff --git a/simulator/sample_media/transitions/cosmos__orbit_crewobs.mp4 b/simulator/sample_media/transitions/cosmos__orbit_crewobs.mp4
index 38257fd..0bb8336 100644
--- a/simulator/sample_media/transitions/cosmos__orbit_crewobs.mp4
+++ b/simulator/sample_media/transitions/cosmos__orbit_crewobs.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc097e21a4821632f8fe47ec8f828f1342fc35f3ec974f7fa919188ef0de209e
-size 1103336
+oid sha256:a1d622a11a3988aed827979232fa2ac634038fc0c8cac3b54268b66e0b2a98ff
+size 3526276
diff --git a/simulator/sample_media/transitions/cosmos__orbit_crewobs.rev.mp4 b/simulator/sample_media/transitions/cosmos__orbit_crewobs.rev.mp4
index 2bfeeee..3bd45b4 100644
--- a/simulator/sample_media/transitions/cosmos__orbit_crewobs.rev.mp4
+++ b/simulator/sample_media/transitions/cosmos__orbit_crewobs.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ee2341a809c1770b8fdf90f0f29d08359d2f01a1a1789005fa2868bd399dba7
-size 1037898
+oid sha256:aff6bdaed9a795d55c8158e20c74b08ec12fe8911c52eb597883fddf74e003cc
+size 3326877
diff --git a/simulator/sample_media/transitions/cosmos__orbit_planetearth.mp4 b/simulator/sample_media/transitions/cosmos__orbit_planetearth.mp4
index c9f00a8..3c4e9f8 100644
--- a/simulator/sample_media/transitions/cosmos__orbit_planetearth.mp4
+++ b/simulator/sample_media/transitions/cosmos__orbit_planetearth.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96f7d6ec0d1a10b7daaba4150be96b2688e43f7278744d65eb8a70a5df08e260
-size 1105667
+oid sha256:69136f717b1f8cfbbc0f8f227b39956043283fbbabf6776f4435363bd4a4c57e
+size 3241038
diff --git a/simulator/sample_media/transitions/cosmos__orbit_planetearth.rev.mp4 b/simulator/sample_media/transitions/cosmos__orbit_planetearth.rev.mp4
index 23a4e75..07fb9ab 100644
--- a/simulator/sample_media/transitions/cosmos__orbit_planetearth.rev.mp4
+++ b/simulator/sample_media/transitions/cosmos__orbit_planetearth.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f3081a60931c33cbe44de99f58e8e85a9ea944f55f968581553d2328c3e6eef6
-size 1051454
+oid sha256:5402e85d4599e752f12a11516e05f1fd7b09c1b1ab6a4335143f22c816bb77e3
+size 3037134
diff --git a/simulator/sample_media/transitions/cosmos_galaxies__orbit_bluemarble.mp4 b/simulator/sample_media/transitions/cosmos_galaxies__orbit_bluemarble.mp4
index 2e5523f..4c39aab 100644
--- a/simulator/sample_media/transitions/cosmos_galaxies__orbit_bluemarble.mp4
+++ b/simulator/sample_media/transitions/cosmos_galaxies__orbit_bluemarble.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6dbaf53526e070c1f16ab6d7cfd7decf028cab389f161bb23c40d97e58c8e7f2
-size 822683
+oid sha256:7e70540a230cab274596cbcfda955efc656bf5d3c3e8b187c1b3e19f61b40e56
+size 3296902
diff --git a/simulator/sample_media/transitions/cosmos_galaxies__orbit_bluemarble.rev.mp4 b/simulator/sample_media/transitions/cosmos_galaxies__orbit_bluemarble.rev.mp4
index e2f070b..c186815 100644
--- a/simulator/sample_media/transitions/cosmos_galaxies__orbit_bluemarble.rev.mp4
+++ b/simulator/sample_media/transitions/cosmos_galaxies__orbit_bluemarble.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0bf6dc990492c0daea8f38b7b1bee8e39e9983f812713d43126b04c8fa11169a
-size 785530
+oid sha256:b4273567214032fadf18e4fb61b046f3c33210b26df980828cdde8ddac665a5f
+size 3178368
diff --git a/simulator/sample_media/transitions/cosmos_galaxies__orbit_crewobs.mp4 b/simulator/sample_media/transitions/cosmos_galaxies__orbit_crewobs.mp4
index 5d76a88..173922e 100644
--- a/simulator/sample_media/transitions/cosmos_galaxies__orbit_crewobs.mp4
+++ b/simulator/sample_media/transitions/cosmos_galaxies__orbit_crewobs.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e6baaea8828a2e421802401b22e32ff851ba5b69bf8ce42a6b220d84e5c9108
-size 782326
+oid sha256:c28c12b10b2205efd805fb2638accfd259e3a0321b141f6b8f71748710b5bbd7
+size 3158836
diff --git a/simulator/sample_media/transitions/cosmos_galaxies__orbit_crewobs.rev.mp4 b/simulator/sample_media/transitions/cosmos_galaxies__orbit_crewobs.rev.mp4
index bc54a72..0d4beda 100644
--- a/simulator/sample_media/transitions/cosmos_galaxies__orbit_crewobs.rev.mp4
+++ b/simulator/sample_media/transitions/cosmos_galaxies__orbit_crewobs.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:63383d469bfb1ea04f8453983405180a73e07c1f61c03d30453e86e519a60476
-size 740138
+oid sha256:e05c0f286befde1d76bdd0199b9fa5a7d1e046b71a526dad0852c6e7b47af57f
+size 3008804
diff --git a/simulator/sample_media/transitions/cosmos_galaxies__orbit_planetearth.mp4 b/simulator/sample_media/transitions/cosmos_galaxies__orbit_planetearth.mp4
index 50f9a37..8519aa7 100644
--- a/simulator/sample_media/transitions/cosmos_galaxies__orbit_planetearth.mp4
+++ b/simulator/sample_media/transitions/cosmos_galaxies__orbit_planetearth.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:73e0eb55f9db44809dea91674500d42353a174938b321bc6cb0a96047dfa8c62
-size 760139
+oid sha256:e34460ffbd400bd7e2f265deddba0898c25324ddc6f41df8d64bdc666ce00e2a
+size 2871310
diff --git a/simulator/sample_media/transitions/cosmos_galaxies__orbit_planetearth.rev.mp4 b/simulator/sample_media/transitions/cosmos_galaxies__orbit_planetearth.rev.mp4
index 36f63c1..41720da 100644
--- a/simulator/sample_media/transitions/cosmos_galaxies__orbit_planetearth.rev.mp4
+++ b/simulator/sample_media/transitions/cosmos_galaxies__orbit_planetearth.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:642947f501c6632a4079f42eb1b8e63bc602b7f0f172c2e013066e4ca9b786ed
-size 748543
+oid sha256:86d64b2f86ee369d1dc71a38845fdc04b361fcd263e0054147ce522ecc562621
+size 2716020
diff --git a/simulator/sample_media/transitions/cosmos_hudf__orbit_bluemarble.mp4 b/simulator/sample_media/transitions/cosmos_hudf__orbit_bluemarble.mp4
index c46fdf3..e501c07 100644
--- a/simulator/sample_media/transitions/cosmos_hudf__orbit_bluemarble.mp4
+++ b/simulator/sample_media/transitions/cosmos_hudf__orbit_bluemarble.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:57a89ef7d47c350355d811af1ea51ef9cf41d3643757221fca455826afba02d8
-size 758607
+oid sha256:e8233b38290a752b6bcc74dc273e7ee5fdb881d7fde1435dd9c805f6c0a9fe14
+size 3111740
diff --git a/simulator/sample_media/transitions/cosmos_hudf__orbit_bluemarble.rev.mp4 b/simulator/sample_media/transitions/cosmos_hudf__orbit_bluemarble.rev.mp4
index 08bb3a5..e07e416 100644
--- a/simulator/sample_media/transitions/cosmos_hudf__orbit_bluemarble.rev.mp4
+++ b/simulator/sample_media/transitions/cosmos_hudf__orbit_bluemarble.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:70ef4ca59ddfd42c1de822c663e1db97517939ef5b95701f1d8f94a8fd1569e5
-size 697352
+oid sha256:c84a12d0a0589dbb424b913c174fc8a487743461e8fa8e538c5303c36db86342
+size 3005699
diff --git a/simulator/sample_media/transitions/cosmos_hudf__orbit_crewobs.mp4 b/simulator/sample_media/transitions/cosmos_hudf__orbit_crewobs.mp4
index 3a3c644..8d27da8 100644
--- a/simulator/sample_media/transitions/cosmos_hudf__orbit_crewobs.mp4
+++ b/simulator/sample_media/transitions/cosmos_hudf__orbit_crewobs.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e4c307b720ac3c6100703eecedccd273dfc340eadc91fa0bd59f3289e6621c2
-size 713739
+oid sha256:3db778a990ed39983a502dc026f86be0c3dc296de72bdd20ef16cef2b2fbb0c8
+size 2971504
diff --git a/simulator/sample_media/transitions/cosmos_hudf__orbit_crewobs.rev.mp4 b/simulator/sample_media/transitions/cosmos_hudf__orbit_crewobs.rev.mp4
index b0caf2c..df69b9a 100644
--- a/simulator/sample_media/transitions/cosmos_hudf__orbit_crewobs.rev.mp4
+++ b/simulator/sample_media/transitions/cosmos_hudf__orbit_crewobs.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b59d2dc355ce19443491b4d685ff2a6cdae18b4c10a0054cc5e2e7f3ec14022b
-size 668332
+oid sha256:8881342d9687a338831810e6ed43abd0181aab298ba1e4bf875ec3b40031d488
+size 2836136
diff --git a/simulator/sample_media/transitions/cosmos_hudf__orbit_planetearth.mp4 b/simulator/sample_media/transitions/cosmos_hudf__orbit_planetearth.mp4
index e820543..9d6efcb 100644
--- a/simulator/sample_media/transitions/cosmos_hudf__orbit_planetearth.mp4
+++ b/simulator/sample_media/transitions/cosmos_hudf__orbit_planetearth.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa52a93a7600f5fcc7b41a497ae9ccabbe0fc915bd5d65e975c369bce4904ecf
-size 719757
+oid sha256:09fad33fd752898a08fa8b74c1d81cf4dd1dbee7c6e3a4f9f018e65dc1b38b43
+size 2680589
diff --git a/simulator/sample_media/transitions/cosmos_hudf__orbit_planetearth.rev.mp4 b/simulator/sample_media/transitions/cosmos_hudf__orbit_planetearth.rev.mp4
index 61c4edd..1e5c37f 100644
--- a/simulator/sample_media/transitions/cosmos_hudf__orbit_planetearth.rev.mp4
+++ b/simulator/sample_media/transitions/cosmos_hudf__orbit_planetearth.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2c30f4c9344b5d4d37399b10313349f83e75113eca4384a47dadd34ff954e486
-size 679632
+oid sha256:4bfe5a550e3f59c26941b3a65a41e424a3f4536590f1c628581c540de0ebfcdd
+size 2540103
diff --git a/simulator/sample_media/transitions/cosmos_miri__orbit_bluemarble.mp4 b/simulator/sample_media/transitions/cosmos_miri__orbit_bluemarble.mp4
index 1509f97..99eb058 100644
--- a/simulator/sample_media/transitions/cosmos_miri__orbit_bluemarble.mp4
+++ b/simulator/sample_media/transitions/cosmos_miri__orbit_bluemarble.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15193a62384dce41569569adee70d544f589d05875da62f842c01087f95cb91f
-size 1004949
+oid sha256:e52c56fc79fc0b9c0bdebc2448c7e705108fe9eb0db6fc2f9b566ed459e748de
+size 3485694
diff --git a/simulator/sample_media/transitions/cosmos_miri__orbit_bluemarble.rev.mp4 b/simulator/sample_media/transitions/cosmos_miri__orbit_bluemarble.rev.mp4
index 6e02456..037ac4f 100644
--- a/simulator/sample_media/transitions/cosmos_miri__orbit_bluemarble.rev.mp4
+++ b/simulator/sample_media/transitions/cosmos_miri__orbit_bluemarble.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fbb11dde53c0202f4d0b9f60883b7de7154013ff143a32d113f9775a9647f804
-size 923898
+oid sha256:41063dabd2429357f23df8f5fda04f965c3cf96b52999da7be1561f1a8740881
+size 3319665
diff --git a/simulator/sample_media/transitions/cosmos_miri__orbit_crewobs.mp4 b/simulator/sample_media/transitions/cosmos_miri__orbit_crewobs.mp4
index 283982a..747a226 100644
--- a/simulator/sample_media/transitions/cosmos_miri__orbit_crewobs.mp4
+++ b/simulator/sample_media/transitions/cosmos_miri__orbit_crewobs.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:212c74db1134860b83dd455f2dc8eedd5e954f6c21b80a7a4efd374048b200c4
-size 962120
+oid sha256:6cddee98c48039a3d5c109c6bf5785a743ccecd5ec1a85fc0e92ef9c963f425c
+size 3346948
diff --git a/simulator/sample_media/transitions/cosmos_miri__orbit_crewobs.rev.mp4 b/simulator/sample_media/transitions/cosmos_miri__orbit_crewobs.rev.mp4
index 5122f4d..3c22c48 100644
--- a/simulator/sample_media/transitions/cosmos_miri__orbit_crewobs.rev.mp4
+++ b/simulator/sample_media/transitions/cosmos_miri__orbit_crewobs.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d27a3e734ea227f2af65fe1f7aa3d9c9faaffc46946e6ae26cd88324aa8b639a
-size 895522
+oid sha256:1d8fb85a887d87c86371e7b26bd7c66ce6e1d02db47626bf6dd7d80c6c350912
+size 3149558
diff --git a/simulator/sample_media/transitions/cosmos_miri__orbit_planetearth.mp4 b/simulator/sample_media/transitions/cosmos_miri__orbit_planetearth.mp4
index 28f49a5..fefcc18 100644
--- a/simulator/sample_media/transitions/cosmos_miri__orbit_planetearth.mp4
+++ b/simulator/sample_media/transitions/cosmos_miri__orbit_planetearth.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f47fa79f3ee7ea1eef2d398e224c58784871a251bdcb662f0b3b662d179246ab
-size 949336
+oid sha256:4f4b62db8d9737c3993798112020b443ed7625d76ef3c818e2058ffb8ca3c18f
+size 3058441
diff --git a/simulator/sample_media/transitions/cosmos_miri__orbit_planetearth.rev.mp4 b/simulator/sample_media/transitions/cosmos_miri__orbit_planetearth.rev.mp4
index 6f72afb..9612d45 100644
--- a/simulator/sample_media/transitions/cosmos_miri__orbit_planetearth.rev.mp4
+++ b/simulator/sample_media/transitions/cosmos_miri__orbit_planetearth.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26a991586ab21e8978e64e3019d6883febda6d7cd2b725687946d0528ee39a04
-size 908675
+oid sha256:099f247df9e2623702cdde39347c65dd542358146a6adea4c46fff0e7d644018
+size 2856775
diff --git a/simulator/sample_media/transitions/cosmos_xdf__orbit_bluemarble.mp4 b/simulator/sample_media/transitions/cosmos_xdf__orbit_bluemarble.mp4
index 8518f5d..b507509 100644
--- a/simulator/sample_media/transitions/cosmos_xdf__orbit_bluemarble.mp4
+++ b/simulator/sample_media/transitions/cosmos_xdf__orbit_bluemarble.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b57a2b94e0ac044e2a8738c8ffbfa8e1bedc3af68e698fa822bdb214724fa4c
-size 546150
+oid sha256:13f118f09814355ed01dc93b55c424b31ce6efd17bfcd7c59f2bc8494979233a
+size 2763196
diff --git a/simulator/sample_media/transitions/cosmos_xdf__orbit_bluemarble.rev.mp4 b/simulator/sample_media/transitions/cosmos_xdf__orbit_bluemarble.rev.mp4
index 17ff499..791759c 100644
--- a/simulator/sample_media/transitions/cosmos_xdf__orbit_bluemarble.rev.mp4
+++ b/simulator/sample_media/transitions/cosmos_xdf__orbit_bluemarble.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:031d4ed22700cd1cbaa5f6bd4a53f390005f913aa6bca0af95f9b91592a639a4
-size 505118
+oid sha256:d77046b36214910faaabd17a622bf9ce6136ba4ce2c8f578ef7fc82aeab0fcc9
+size 2683259
diff --git a/simulator/sample_media/transitions/cosmos_xdf__orbit_crewobs.mp4 b/simulator/sample_media/transitions/cosmos_xdf__orbit_crewobs.mp4
index 5a7099a..bfd7f27 100644
--- a/simulator/sample_media/transitions/cosmos_xdf__orbit_crewobs.mp4
+++ b/simulator/sample_media/transitions/cosmos_xdf__orbit_crewobs.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b7cd21398ecdb341af3be81153788e8cd54138aee4ca761afbce3d509093e571
-size 500775
+oid sha256:c29924101f371b1968041097057e0fd02908ebd2b2c06ab4e590b6f4d68cdc5e
+size 2622797
diff --git a/simulator/sample_media/transitions/cosmos_xdf__orbit_crewobs.rev.mp4 b/simulator/sample_media/transitions/cosmos_xdf__orbit_crewobs.rev.mp4
index 1421221..387e7fc 100644
--- a/simulator/sample_media/transitions/cosmos_xdf__orbit_crewobs.rev.mp4
+++ b/simulator/sample_media/transitions/cosmos_xdf__orbit_crewobs.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:63384439d449f09a0749654bb3aa1566ea0751bc26044ce0b953e0a99e8cf1e1
-size 474272
+oid sha256:81e3841f50a31b9f5c1c95dca3d4639306a62b3d4c62801b93c7013df3604232
+size 2513881
diff --git a/simulator/sample_media/transitions/cosmos_xdf__orbit_planetearth.mp4 b/simulator/sample_media/transitions/cosmos_xdf__orbit_planetearth.mp4
index 8a0137a..6991650 100644
--- a/simulator/sample_media/transitions/cosmos_xdf__orbit_planetearth.mp4
+++ b/simulator/sample_media/transitions/cosmos_xdf__orbit_planetearth.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0dde11b8634cc2884ac5a6e61fce6eedbd716bbb267b9d89cbe0fb59cfb5ad6b
-size 503144
+oid sha256:3e72b8f34e3b4aaf6fb8b52d01ead73231c81cc078adc43587d8d75485ee52e4
+size 2331800
diff --git a/simulator/sample_media/transitions/cosmos_xdf__orbit_planetearth.rev.mp4 b/simulator/sample_media/transitions/cosmos_xdf__orbit_planetearth.rev.mp4
index 1ca5c3f..db61fcb 100644
--- a/simulator/sample_media/transitions/cosmos_xdf__orbit_planetearth.rev.mp4
+++ b/simulator/sample_media/transitions/cosmos_xdf__orbit_planetearth.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee932652fc9d40b6374f05575d32c2559f575e2e4eb7541c3b1fb87442a02186
-size 489151
+oid sha256:1749d8d02f71b3d2ae3b7ae9f95cc7c963d3a489373970d339675703a8c249b5
+size 2217807
diff --git a/simulator/sample_media/transitions/orbit_bluemarble__coast_birdrock.mp4 b/simulator/sample_media/transitions/orbit_bluemarble__coast_birdrock.mp4
index 6a949ec..2eaed42 100644
--- a/simulator/sample_media/transitions/orbit_bluemarble__coast_birdrock.mp4
+++ b/simulator/sample_media/transitions/orbit_bluemarble__coast_birdrock.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52c8af76a527441d414718b1830b2a1b445f30c3e9c8dab6c3e117e695b35201
-size 3357806
+oid sha256:93941cdb3d9eaf4b783b35d678a1a41f9de16f8fd6b586e934c393112eb01915
+size 4717897
diff --git a/simulator/sample_media/transitions/orbit_bluemarble__coast_birdrock.rev.mp4 b/simulator/sample_media/transitions/orbit_bluemarble__coast_birdrock.rev.mp4
index 989b64a..9ac1154 100644
--- a/simulator/sample_media/transitions/orbit_bluemarble__coast_birdrock.rev.mp4
+++ b/simulator/sample_media/transitions/orbit_bluemarble__coast_birdrock.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db34245e6fb82f5a908ec92f9c40561adc2333fd2f44bf31a52bd5a594d19e23
-size 3199717
+oid sha256:3c96cf96e684ad8e58081cc5c322a0b573d6a80d591c3296c6b7d1689e836ff4
+size 4491918
diff --git a/simulator/sample_media/transitions/orbit_bluemarble__coast_drakesbeach.mp4 b/simulator/sample_media/transitions/orbit_bluemarble__coast_drakesbeach.mp4
index 6541951..5aeb448 100644
--- a/simulator/sample_media/transitions/orbit_bluemarble__coast_drakesbeach.mp4
+++ b/simulator/sample_media/transitions/orbit_bluemarble__coast_drakesbeach.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af686a73c0703040cf0cb31fb865215748c4ab677218f377f0e3c06dbe378f25
-size 1437665
+oid sha256:b26bc2ee1e317f9ed5120d7f449b1199e9e716e59dae183859957127d0a5b053
+size 3861964
diff --git a/simulator/sample_media/transitions/orbit_bluemarble__coast_drakesbeach.rev.mp4 b/simulator/sample_media/transitions/orbit_bluemarble__coast_drakesbeach.rev.mp4
index 6d0fb2c..638f6d0 100644
--- a/simulator/sample_media/transitions/orbit_bluemarble__coast_drakesbeach.rev.mp4
+++ b/simulator/sample_media/transitions/orbit_bluemarble__coast_drakesbeach.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:99b4ccf2d3767a418d6ef9461b8b2ca583ddda27dbaa6d2a4ed2dee34b5df5a9
-size 1354340
+oid sha256:c290085f900b573eadbb1e8b2678fc57358132376e75248e21ebbde229f6a85b
+size 3603757
diff --git a/simulator/sample_media/transitions/orbit_bluemarble__coast_elkbeach.mp4 b/simulator/sample_media/transitions/orbit_bluemarble__coast_elkbeach.mp4
index 0370f5e..9c08c0f 100644
--- a/simulator/sample_media/transitions/orbit_bluemarble__coast_elkbeach.mp4
+++ b/simulator/sample_media/transitions/orbit_bluemarble__coast_elkbeach.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a0d6be93d8ebbe839adf96e14098364578d33b3df1334130178f69f8609a700
-size 1574172
+oid sha256:ead6df9a1e2bbd20bf79a2ddfdb2fb13f87b27bf67703db4076c0ffea507e1fb
+size 3552254
diff --git a/simulator/sample_media/transitions/orbit_bluemarble__coast_elkbeach.rev.mp4 b/simulator/sample_media/transitions/orbit_bluemarble__coast_elkbeach.rev.mp4
index 94aa4b5..2de382a 100644
--- a/simulator/sample_media/transitions/orbit_bluemarble__coast_elkbeach.rev.mp4
+++ b/simulator/sample_media/transitions/orbit_bluemarble__coast_elkbeach.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:55684f20b47312cbde23fab18735a0b7bd627271859fd761b89576dbedbfc8e9
-size 1498989
+oid sha256:ec7c81958ae116b15b4cf3c6440d0545bcdfbe4146d8a2cd7e3171e8710bd732
+size 3313746
diff --git a/simulator/sample_media/transitions/orbit_bluemarble__coast_surfgrass.mp4 b/simulator/sample_media/transitions/orbit_bluemarble__coast_surfgrass.mp4
index 4ce9536..b6b377b 100644
--- a/simulator/sample_media/transitions/orbit_bluemarble__coast_surfgrass.mp4
+++ b/simulator/sample_media/transitions/orbit_bluemarble__coast_surfgrass.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d128d17b6802e177f070ee073ecc7652971a361df840a59ba68c3d3d38f3c93
-size 2040657
+oid sha256:c87eea7bee3d31ce1200f01e50b42566830acaea9fe3fdf7fe353b5541f74577
+size 6034438
diff --git a/simulator/sample_media/transitions/orbit_bluemarble__coast_surfgrass.rev.mp4 b/simulator/sample_media/transitions/orbit_bluemarble__coast_surfgrass.rev.mp4
index 4768ab8..dae0a63 100644
--- a/simulator/sample_media/transitions/orbit_bluemarble__coast_surfgrass.rev.mp4
+++ b/simulator/sample_media/transitions/orbit_bluemarble__coast_surfgrass.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e860ceed05a9535ab3a52c8ffd010cd7e413b94790c8f097fe34c9eefbe1a20f
-size 1863664
+oid sha256:a27c8ef2112abf815fb71b476edc4a650a836414c3d9a18a704089882324aa99
+size 5760245
diff --git a/simulator/sample_media/transitions/orbit_crewobs__coast_birdrock.mp4 b/simulator/sample_media/transitions/orbit_crewobs__coast_birdrock.mp4
index 9da1ee0..c7e88d2 100644
--- a/simulator/sample_media/transitions/orbit_crewobs__coast_birdrock.mp4
+++ b/simulator/sample_media/transitions/orbit_crewobs__coast_birdrock.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b4661a960cbd0c06bc7dafe8f659d5b67b21f2137e4a2b1783a1454bcf3daafa
-size 3129010
+oid sha256:013038578d8cc21d84da8b095e128e5b951f01cde2069099fed41f00ddea3f00
+size 4257133
diff --git a/simulator/sample_media/transitions/orbit_crewobs__coast_birdrock.rev.mp4 b/simulator/sample_media/transitions/orbit_crewobs__coast_birdrock.rev.mp4
index 2d564ac..e04d75f 100644
--- a/simulator/sample_media/transitions/orbit_crewobs__coast_birdrock.rev.mp4
+++ b/simulator/sample_media/transitions/orbit_crewobs__coast_birdrock.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b4e614d0a7fd3736572eae8c3cd84163f3c71dc3b6ea09c058f55f878d22f7e5
-size 2908074
+oid sha256:1e1192900b3e400bd15138d40b706bf7f40db1608a077aeb722b0a88037a4ae7
+size 4113774
diff --git a/simulator/sample_media/transitions/orbit_crewobs__coast_drakesbeach.mp4 b/simulator/sample_media/transitions/orbit_crewobs__coast_drakesbeach.mp4
index 2af1f6c..514a6ef 100644
--- a/simulator/sample_media/transitions/orbit_crewobs__coast_drakesbeach.mp4
+++ b/simulator/sample_media/transitions/orbit_crewobs__coast_drakesbeach.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:238ed662f5c77e2f4f945d5f91f89e08919fa61043ab52d43db95abf02d17d14
-size 1222691
+oid sha256:483cf9b2edc09f0beeb073561cd0eaf8145f9a6032c428d367deaa75644d4ffe
+size 3401886
diff --git a/simulator/sample_media/transitions/orbit_crewobs__coast_drakesbeach.rev.mp4 b/simulator/sample_media/transitions/orbit_crewobs__coast_drakesbeach.rev.mp4
index 0306771..370eee8 100644
--- a/simulator/sample_media/transitions/orbit_crewobs__coast_drakesbeach.rev.mp4
+++ b/simulator/sample_media/transitions/orbit_crewobs__coast_drakesbeach.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:826b84408546cfa6bd31ef36bbd9ad9a3fda5cb995f486f4c6649a89c89e66c0
-size 1072280
+oid sha256:bc333b7500d529dd3f408007e7d9dbc2269c596b31816adbf8387876c10137f5
+size 3228496
diff --git a/simulator/sample_media/transitions/orbit_crewobs__coast_elkbeach.mp4 b/simulator/sample_media/transitions/orbit_crewobs__coast_elkbeach.mp4
index 101e1e4..6a04e4f 100644
--- a/simulator/sample_media/transitions/orbit_crewobs__coast_elkbeach.mp4
+++ b/simulator/sample_media/transitions/orbit_crewobs__coast_elkbeach.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7be1bb5426cf78b265bab8d21b743611d8bde7ba01b6cb41c6e5cb824dbd741b
-size 1368111
+oid sha256:08f08cbb44ae79cb05c313accfbee72a59b463391ef3b1473446f7776f7b2e3c
+size 3102982
diff --git a/simulator/sample_media/transitions/orbit_crewobs__coast_elkbeach.rev.mp4 b/simulator/sample_media/transitions/orbit_crewobs__coast_elkbeach.rev.mp4
index b71e3a0..76596ea 100644
--- a/simulator/sample_media/transitions/orbit_crewobs__coast_elkbeach.rev.mp4
+++ b/simulator/sample_media/transitions/orbit_crewobs__coast_elkbeach.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c0c5c00f3cbb7ee07214c8074874c440e9b7f4da5dcd58ca30477f1f1b13c85a
-size 1220724
+oid sha256:d35139aff7890796b187d135eaf37204cf87bf0735a88d2c1d201b24d325c460
+size 2949107
diff --git a/simulator/sample_media/transitions/orbit_crewobs__coast_surfgrass.mp4 b/simulator/sample_media/transitions/orbit_crewobs__coast_surfgrass.mp4
index a230cd5..f043703 100644
--- a/simulator/sample_media/transitions/orbit_crewobs__coast_surfgrass.mp4
+++ b/simulator/sample_media/transitions/orbit_crewobs__coast_surfgrass.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84d5ba8482e6de483ee1e19423d0bbd5524af3265ded5b63c87e81c3e68d77bf
-size 1812584
+oid sha256:da25a2e40d19397c7006c8fccb9f9a4fe0f31fd77801562b4892c015e77bce1b
+size 5572515
diff --git a/simulator/sample_media/transitions/orbit_crewobs__coast_surfgrass.rev.mp4 b/simulator/sample_media/transitions/orbit_crewobs__coast_surfgrass.rev.mp4
index 9370131..9bcb0ae 100644
--- a/simulator/sample_media/transitions/orbit_crewobs__coast_surfgrass.rev.mp4
+++ b/simulator/sample_media/transitions/orbit_crewobs__coast_surfgrass.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e7b611b3f33d0466f3764766e14d5681eafb6b7ddc3a3c1564497d0d4f49853
-size 1585623
+oid sha256:c2399b1e1cdf9d7ef1afaf4a018d9d97010194848d8d1be0a27fea1ae72c34da
+size 5382839
diff --git a/simulator/sample_media/transitions/orbit_planetearth__coast_birdrock.mp4 b/simulator/sample_media/transitions/orbit_planetearth__coast_birdrock.mp4
index 81f822e..177d050 100644
--- a/simulator/sample_media/transitions/orbit_planetearth__coast_birdrock.mp4
+++ b/simulator/sample_media/transitions/orbit_planetearth__coast_birdrock.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5633a822d9eb0e7084fac1606a6d52aaef219481ede9636d1980a711d143b6e5
-size 2992082
+oid sha256:6db3648fdcc119ab0ee526e0299d71623dd474441ccd938aa75e5ad28cb4e69d
+size 4415053
diff --git a/simulator/sample_media/transitions/orbit_planetearth__coast_birdrock.rev.mp4 b/simulator/sample_media/transitions/orbit_planetearth__coast_birdrock.rev.mp4
index 4345e86..185e1c5 100644
--- a/simulator/sample_media/transitions/orbit_planetearth__coast_birdrock.rev.mp4
+++ b/simulator/sample_media/transitions/orbit_planetearth__coast_birdrock.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:148143f864527c752c34c44261e227647eb36735217a8500c51183fa61df767f
-size 2819490
+oid sha256:47656c9eb10ff4b49b9976c7795ec02d4ff36d0ede20250781780bb3dfd2bea4
+size 4188667
diff --git a/simulator/sample_media/transitions/orbit_planetearth__coast_drakesbeach.mp4 b/simulator/sample_media/transitions/orbit_planetearth__coast_drakesbeach.mp4
index 370c136..bbdccdc 100644
--- a/simulator/sample_media/transitions/orbit_planetearth__coast_drakesbeach.mp4
+++ b/simulator/sample_media/transitions/orbit_planetearth__coast_drakesbeach.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:499cec6d416c45b8128574f4493cfea59e0328eba20142b4731a2aa40cc06fcc
-size 1085085
+oid sha256:450e5edea5c478d1c6547fc87fb11f39268b81900a9369d7fc9e96e23d1c83d2
+size 3560724
diff --git a/simulator/sample_media/transitions/orbit_planetearth__coast_drakesbeach.rev.mp4 b/simulator/sample_media/transitions/orbit_planetearth__coast_drakesbeach.rev.mp4
index 68c8bc4..1ee1e92 100644
--- a/simulator/sample_media/transitions/orbit_planetearth__coast_drakesbeach.rev.mp4
+++ b/simulator/sample_media/transitions/orbit_planetearth__coast_drakesbeach.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c75b8393e3dacd19aa88f933aead6eae8fc940fbe6b5f4f5ef64571dcf55693
-size 974622
+oid sha256:fd08fc922d12db03e902b09116d1a1367b705f4cb9a5d933dbb67b95bb8dbd39
+size 3302968
diff --git a/simulator/sample_media/transitions/orbit_planetearth__coast_elkbeach.mp4 b/simulator/sample_media/transitions/orbit_planetearth__coast_elkbeach.mp4
index 1959827..a352f1c 100644
--- a/simulator/sample_media/transitions/orbit_planetearth__coast_elkbeach.mp4
+++ b/simulator/sample_media/transitions/orbit_planetearth__coast_elkbeach.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:690d40e652c996a0b6be7be3358e55dea6894bbb48c49c26db42d6f2094398ea
-size 1219341
+oid sha256:71ecd9c01eca99c684c1de1540f710448fdedbfb037b0646832fb699e1a8638e
+size 3263431
diff --git a/simulator/sample_media/transitions/orbit_planetearth__coast_elkbeach.rev.mp4 b/simulator/sample_media/transitions/orbit_planetearth__coast_elkbeach.rev.mp4
index 216e6ed..1a3cc1c 100644
--- a/simulator/sample_media/transitions/orbit_planetearth__coast_elkbeach.rev.mp4
+++ b/simulator/sample_media/transitions/orbit_planetearth__coast_elkbeach.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d24c89586299d0e3e060a79e77d6ba93e56333c819e19d0520b9fa949d73f05
-size 1128962
+oid sha256:22e4509ca9580a89e4c0174d461eeb28ba8588f7db9026c9fe79a9b24db6b8ee
+size 3025298
diff --git a/simulator/sample_media/transitions/orbit_planetearth__coast_surfgrass.mp4 b/simulator/sample_media/transitions/orbit_planetearth__coast_surfgrass.mp4
index 6d7876b..7957bcd 100644
--- a/simulator/sample_media/transitions/orbit_planetearth__coast_surfgrass.mp4
+++ b/simulator/sample_media/transitions/orbit_planetearth__coast_surfgrass.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:63ac135bc9900f22a6f9995b8ce18debe78e1cdcfdd381c55957191e9a809b00
-size 1654962
+oid sha256:45c7d504a5952fea2d14f4a332554adf878db3d658b9595c22dd03020e2e9f52
+size 5731575
diff --git a/simulator/sample_media/transitions/orbit_planetearth__coast_surfgrass.rev.mp4 b/simulator/sample_media/transitions/orbit_planetearth__coast_surfgrass.rev.mp4
index 0f6da8d..93da2dd 100644
--- a/simulator/sample_media/transitions/orbit_planetearth__coast_surfgrass.rev.mp4
+++ b/simulator/sample_media/transitions/orbit_planetearth__coast_surfgrass.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb7cf6ab4554bd4eceebc065bc5d6ad297ccc391130c7b7c49150bd916a46388
-size 1483788
+oid sha256:a66c1446ada4da63b0303d660a77cdb2b13e1224b20e39b733ba8b9ed33b5f2a
+size 5456607
diff --git a/simulator/sample_media/transitions/reef_coralspacific__abyss_hiding.mp4 b/simulator/sample_media/transitions/reef_coralspacific__abyss_hiding.mp4
index 145e977..d9a7d3b 100644
--- a/simulator/sample_media/transitions/reef_coralspacific__abyss_hiding.mp4
+++ b/simulator/sample_media/transitions/reef_coralspacific__abyss_hiding.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a5bcc30611cecae6a8067ee198a3be32b894824efa34c8a4e7b812c724c03b19
-size 1421648
+oid sha256:532458f6d17a3cdb47773dee8c6d7e2174987e7ba5454c232cd4de76b96081e8
+size 2575170
diff --git a/simulator/sample_media/transitions/reef_coralspacific__abyss_hiding.rev.mp4 b/simulator/sample_media/transitions/reef_coralspacific__abyss_hiding.rev.mp4
index eb80a49..8d6486d 100644
--- a/simulator/sample_media/transitions/reef_coralspacific__abyss_hiding.rev.mp4
+++ b/simulator/sample_media/transitions/reef_coralspacific__abyss_hiding.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a134b63bacc7398ee0ad369c8e91ac6735c6fb357d53556f223de1c16b221c5
-size 1403063
+oid sha256:12be54943b477df7b4371b4fdaa09c8e42f282b537e130283ff159adb5bf2ffe
+size 2402422
diff --git a/simulator/sample_media/transitions/reef_coralspacific__abyss_midwaterexp.mp4 b/simulator/sample_media/transitions/reef_coralspacific__abyss_midwaterexp.mp4
index 75d157e..65c7fc0 100644
--- a/simulator/sample_media/transitions/reef_coralspacific__abyss_midwaterexp.mp4
+++ b/simulator/sample_media/transitions/reef_coralspacific__abyss_midwaterexp.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc3c2275cac20abf3d6501d9fde1ccf964d57def3d27e4e832f7f4d56ea293a5
-size 1674956
+oid sha256:833a79e75fc1a19ccb2c1c3628180dd6c197166e93ab20eda6a2a26ead87d995
+size 3017201
diff --git a/simulator/sample_media/transitions/reef_coralspacific__abyss_midwaterexp.rev.mp4 b/simulator/sample_media/transitions/reef_coralspacific__abyss_midwaterexp.rev.mp4
index e2eab23..577d90b 100644
--- a/simulator/sample_media/transitions/reef_coralspacific__abyss_midwaterexp.rev.mp4
+++ b/simulator/sample_media/transitions/reef_coralspacific__abyss_midwaterexp.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d928c7d8a91233bb945d893c27197306faea5574a8c2d8ba1ad716b49a28ec0
-size 1659432
+oid sha256:3e108aca9b55ccee25c9f4cf85532f89ae1062f23a7bc670680b46615dd06e9b
+size 2822564
diff --git a/simulator/sample_media/transitions/reef_coralspacific__abyss_wow.mp4 b/simulator/sample_media/transitions/reef_coralspacific__abyss_wow.mp4
index 39d98a6..ea1da20 100644
--- a/simulator/sample_media/transitions/reef_coralspacific__abyss_wow.mp4
+++ b/simulator/sample_media/transitions/reef_coralspacific__abyss_wow.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c99ba9e9f64ebba786525673667abd420a2c94909f04373ebe0d0e1138acd6ec
-size 1482368
+oid sha256:1160d53aed0726e102dfa36e317ea426005de4d7c158ba2adaf60575c31bed0c
+size 2655118
diff --git a/simulator/sample_media/transitions/reef_coralspacific__abyss_wow.rev.mp4 b/simulator/sample_media/transitions/reef_coralspacific__abyss_wow.rev.mp4
index 1b6cfea..443cf62 100644
--- a/simulator/sample_media/transitions/reef_coralspacific__abyss_wow.rev.mp4
+++ b/simulator/sample_media/transitions/reef_coralspacific__abyss_wow.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b3b899bc6f228c5147e72369a08c5ef340983fe96c4da3840f183ca01562a0f6
-size 1465343
+oid sha256:5dbabe45b732088e1e9cef495229a9708607c69000b56711c627a105fb2cd065
+size 2455259
diff --git a/simulator/sample_media/transitions/reef_hawkfish__abyss_hiding.mp4 b/simulator/sample_media/transitions/reef_hawkfish__abyss_hiding.mp4
index 5185a49..c56a309 100644
--- a/simulator/sample_media/transitions/reef_hawkfish__abyss_hiding.mp4
+++ b/simulator/sample_media/transitions/reef_hawkfish__abyss_hiding.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec34db2927531c41f9990fe6d61a083984eda771b9e318bad952efce7f5f91a9
-size 869572
+oid sha256:69be6bf1f29e0cca0abddeda1d1ee49472337c2c9c9552554c9ebeb6e8f2ddde
+size 1799935
diff --git a/simulator/sample_media/transitions/reef_hawkfish__abyss_hiding.rev.mp4 b/simulator/sample_media/transitions/reef_hawkfish__abyss_hiding.rev.mp4
index 388f84b..c19a12c 100644
--- a/simulator/sample_media/transitions/reef_hawkfish__abyss_hiding.rev.mp4
+++ b/simulator/sample_media/transitions/reef_hawkfish__abyss_hiding.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59eee4df73835cdf8d7062819f5970708d9ce329ee1211a2fc6c3ccdddfee6b3
-size 847251
+oid sha256:7d1e9ad1dc7fd62c581db96a834abe8f3ccdf6ec2cd1fdb853ec52603b3f9467
+size 1736360
diff --git a/simulator/sample_media/transitions/reef_hawkfish__abyss_midwaterexp.mp4 b/simulator/sample_media/transitions/reef_hawkfish__abyss_midwaterexp.mp4
index cc7fe4f..1fe9739 100644
--- a/simulator/sample_media/transitions/reef_hawkfish__abyss_midwaterexp.mp4
+++ b/simulator/sample_media/transitions/reef_hawkfish__abyss_midwaterexp.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7547ed145f9bbf55735b3b7d538bd4e5639e41dcbe1b74210f2f2f2eb600c173
-size 1125195
+oid sha256:bf18ea3f607af12f9103b564f87334c2c37f9717977b77141b64553ba004b523
+size 2240318
diff --git a/simulator/sample_media/transitions/reef_hawkfish__abyss_midwaterexp.rev.mp4 b/simulator/sample_media/transitions/reef_hawkfish__abyss_midwaterexp.rev.mp4
index 436ac06..38d71f0 100644
--- a/simulator/sample_media/transitions/reef_hawkfish__abyss_midwaterexp.rev.mp4
+++ b/simulator/sample_media/transitions/reef_hawkfish__abyss_midwaterexp.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d25efa3c6b0e0a60ae775adaed9d621234fbe4ed7716fe1e2748cabd3b929f2e
-size 1104998
+oid sha256:098b84a195dead240894de9ecbfd177736a2bc5d833b6c77338915cb4c35acec
+size 2155058
diff --git a/simulator/sample_media/transitions/reef_hawkfish__abyss_wow.mp4 b/simulator/sample_media/transitions/reef_hawkfish__abyss_wow.mp4
index 89d83d5..de5286e 100644
--- a/simulator/sample_media/transitions/reef_hawkfish__abyss_wow.mp4
+++ b/simulator/sample_media/transitions/reef_hawkfish__abyss_wow.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b35a50a704a72898227e95857bb1c60b1ac2843ac837f3e922436c4191cdd838
-size 911442
+oid sha256:de7e6bd0292741ffef5bb07e0ba29b2f3cddb6a7ff162d5d1a3735a2bb9ee1f4
+size 1882687
diff --git a/simulator/sample_media/transitions/reef_hawkfish__abyss_wow.rev.mp4 b/simulator/sample_media/transitions/reef_hawkfish__abyss_wow.rev.mp4
index e00f90b..e3430e4 100644
--- a/simulator/sample_media/transitions/reef_hawkfish__abyss_wow.rev.mp4
+++ b/simulator/sample_media/transitions/reef_hawkfish__abyss_wow.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2481a9ebc1a4cdf842d9c74a7767cc716f536fe44385fe774b11a9b0b8b88571
-size 915260
+oid sha256:eebe944c17eee66a021d60e41aa7e6a0423f7da386aa2c144d394f46c8022889
+size 1791484
diff --git a/simulator/sample_media/transitions/reef_lionfish__abyss_hiding.mp4 b/simulator/sample_media/transitions/reef_lionfish__abyss_hiding.mp4
index f162670..5faf622 100644
--- a/simulator/sample_media/transitions/reef_lionfish__abyss_hiding.mp4
+++ b/simulator/sample_media/transitions/reef_lionfish__abyss_hiding.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2920cddeb2dbc6b3acfa30e213df489ffbad3315de7cd1c4fad16a8394be58c2
-size 824459
+oid sha256:6b12335aa5ca13e9ae6e1e17fd7b504590a8611e210deac0dedc81db5b247f41
+size 1804360
diff --git a/simulator/sample_media/transitions/reef_lionfish__abyss_hiding.rev.mp4 b/simulator/sample_media/transitions/reef_lionfish__abyss_hiding.rev.mp4
index f62d963..0701e63 100644
--- a/simulator/sample_media/transitions/reef_lionfish__abyss_hiding.rev.mp4
+++ b/simulator/sample_media/transitions/reef_lionfish__abyss_hiding.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b9e6e1489026f678cd72f48063f708f863f7cd26762b430893d956b4069ae042
-size 802476
+oid sha256:4e75e251eafb98a4bf740cdd068ebdeaa1319a33e233b825f481e00122e81825
+size 1717703
diff --git a/simulator/sample_media/transitions/reef_lionfish__abyss_midwaterexp.mp4 b/simulator/sample_media/transitions/reef_lionfish__abyss_midwaterexp.mp4
index 9b94233..a5f9289 100644
--- a/simulator/sample_media/transitions/reef_lionfish__abyss_midwaterexp.mp4
+++ b/simulator/sample_media/transitions/reef_lionfish__abyss_midwaterexp.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:22eb8df7fb8c5a098ce3bc17f5ebaa122dddb284b3aa397ddcc9e269d6579d48
-size 1080021
+oid sha256:231c1ecb3b5021337467fe097c6d2871663abb08660819c4c6fdcb0c245dc307
+size 2246877
diff --git a/simulator/sample_media/transitions/reef_lionfish__abyss_midwaterexp.rev.mp4 b/simulator/sample_media/transitions/reef_lionfish__abyss_midwaterexp.rev.mp4
index 6132eb8..d3f0f4c 100644
--- a/simulator/sample_media/transitions/reef_lionfish__abyss_midwaterexp.rev.mp4
+++ b/simulator/sample_media/transitions/reef_lionfish__abyss_midwaterexp.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1bac5436f82d4cecf66fb7ed6b753528e0710dc19e7f29660bcbf7b0f6c53dbb
-size 1058642
+oid sha256:d023a64c7c4035eba3af59234df092c13ffe8d780f4d32325af9b8f4b27dbbd3
+size 2138006
diff --git a/simulator/sample_media/transitions/reef_lionfish__abyss_wow.mp4 b/simulator/sample_media/transitions/reef_lionfish__abyss_wow.mp4
index 670a303..758f26d 100644
--- a/simulator/sample_media/transitions/reef_lionfish__abyss_wow.mp4
+++ b/simulator/sample_media/transitions/reef_lionfish__abyss_wow.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53634b90ab653bcf098778104043092978d0b749365b8f642736d690433dd2bd
-size 880519
+oid sha256:22a2cc3ed133f04b1c3524a4d9351715f1dc0bd420526004a905297c375d633c
+size 1884702
diff --git a/simulator/sample_media/transitions/reef_lionfish__abyss_wow.rev.mp4 b/simulator/sample_media/transitions/reef_lionfish__abyss_wow.rev.mp4
index f559598..b00a7f5 100644
--- a/simulator/sample_media/transitions/reef_lionfish__abyss_wow.rev.mp4
+++ b/simulator/sample_media/transitions/reef_lionfish__abyss_wow.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c53c92e58b945607d35a1ddfb92330177441745e5504fafa091246bf7cad6dc4
-size 884549
+oid sha256:a8b3cb7910d4b4ea5ded7f43c6dc963e22bdeb448cfd3940bb8808006a8b413b
+size 1770431
diff --git a/simulator/sample_media/transitions/reef_snapper__abyss_hiding.mp4 b/simulator/sample_media/transitions/reef_snapper__abyss_hiding.mp4
index 53138ba..399f302 100644
--- a/simulator/sample_media/transitions/reef_snapper__abyss_hiding.mp4
+++ b/simulator/sample_media/transitions/reef_snapper__abyss_hiding.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:277977b4ffe14f38bb9b45c9ab37d50785bd53e4b25a3e4134a133ac98a2d84f
-size 762665
+oid sha256:a26fc8f471c32bcb97af7d8b0b7e4d42eabba9ff8844a6193976a6ab153fc538
+size 1574829
diff --git a/simulator/sample_media/transitions/reef_snapper__abyss_hiding.rev.mp4 b/simulator/sample_media/transitions/reef_snapper__abyss_hiding.rev.mp4
index d32f16a..08a7de6 100644
--- a/simulator/sample_media/transitions/reef_snapper__abyss_hiding.rev.mp4
+++ b/simulator/sample_media/transitions/reef_snapper__abyss_hiding.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6dcc2655d3c542bc1783ec419cca51f723e8343a68b1c785e6b5b87bb917a3b5
-size 788876
+oid sha256:a86d9785248094d36bb7b5fc5e87425362de1db8b379587871adc87a60ea6f59
+size 1528113
diff --git a/simulator/sample_media/transitions/reef_snapper__abyss_midwaterexp.mp4 b/simulator/sample_media/transitions/reef_snapper__abyss_midwaterexp.mp4
index 1dd5627..08473e0 100644
--- a/simulator/sample_media/transitions/reef_snapper__abyss_midwaterexp.mp4
+++ b/simulator/sample_media/transitions/reef_snapper__abyss_midwaterexp.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eaecbe4813ceb405ce3428d8321b9d49b2d3abcac0d9701b0102e1802a7d21cd
-size 1022273
+oid sha256:5eda70a9072216ed253cff5d37658fde5886043d054f0f440ad35e8441f11d65
+size 2016962
diff --git a/simulator/sample_media/transitions/reef_snapper__abyss_midwaterexp.rev.mp4 b/simulator/sample_media/transitions/reef_snapper__abyss_midwaterexp.rev.mp4
index 746c180..fe3d939 100644
--- a/simulator/sample_media/transitions/reef_snapper__abyss_midwaterexp.rev.mp4
+++ b/simulator/sample_media/transitions/reef_snapper__abyss_midwaterexp.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0922fc199003fe90bc8bee25cfaa2c43a2a16e70c796ef5a79c8aa33dacd5fb6
-size 1039340
+oid sha256:c6d8d82b9a1b39b8e8de921ef2d1fb001b6efa7af4f7c11bf774753edc45d1e7
+size 1947974
diff --git a/simulator/sample_media/transitions/reef_snapper__abyss_wow.mp4 b/simulator/sample_media/transitions/reef_snapper__abyss_wow.mp4
index 13e92cf..5ebc328 100644
--- a/simulator/sample_media/transitions/reef_snapper__abyss_wow.mp4
+++ b/simulator/sample_media/transitions/reef_snapper__abyss_wow.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c44e5960cda9682b61bf1600d9fd413e7f25d3370f56b85070e0c853efe6e8c9
-size 812026
+oid sha256:9bc44f6ba01b5b59ad3d15c24c0f61b3bbc7a83c90d21b758224c31e4e16b5e7
+size 1655612
diff --git a/simulator/sample_media/transitions/reef_snapper__abyss_wow.rev.mp4 b/simulator/sample_media/transitions/reef_snapper__abyss_wow.rev.mp4
index c0e0514..f7e5274 100644
--- a/simulator/sample_media/transitions/reef_snapper__abyss_wow.rev.mp4
+++ b/simulator/sample_media/transitions/reef_snapper__abyss_wow.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a45924d9f0e80e6ee812911ed7fc8b08b79b51b7a9ae1636cee6920c9dcf7e6
-size 858478
+oid sha256:65bc6f6557b135a0398a32b75a44d7eab0558aa2d2cf6b58be1a2f44a3fc10ea
+size 1581517
diff --git a/simulator/sample_media/transitions/reef_spawning__abyss_hiding.mp4 b/simulator/sample_media/transitions/reef_spawning__abyss_hiding.mp4
index e4bdbeb..adc238f 100644
--- a/simulator/sample_media/transitions/reef_spawning__abyss_hiding.mp4
+++ b/simulator/sample_media/transitions/reef_spawning__abyss_hiding.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d924487e2577b0648b794a1ab07efae38a13f537dd56f328accff6da3739e75
-size 1035381
+oid sha256:205dbe4589799bfb60ad644ca102b8824433feefac5a5fc4fc67e612409a2020
+size 1970280
diff --git a/simulator/sample_media/transitions/reef_spawning__abyss_hiding.rev.mp4 b/simulator/sample_media/transitions/reef_spawning__abyss_hiding.rev.mp4
index 4233b2f..aac4f61 100644
--- a/simulator/sample_media/transitions/reef_spawning__abyss_hiding.rev.mp4
+++ b/simulator/sample_media/transitions/reef_spawning__abyss_hiding.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1afd7265bef600eb76133aac7a985c46f1c4e940e89559dd5e100bb1527695a0
-size 982414
+oid sha256:8839ffc4e534cedc6e3a25a37e709f98e134734313c6f381e03e939df7cdca9e
+size 1862680
diff --git a/simulator/sample_media/transitions/reef_spawning__abyss_midwaterexp.mp4 b/simulator/sample_media/transitions/reef_spawning__abyss_midwaterexp.mp4
index bd8ef41..9bfc59c 100644
--- a/simulator/sample_media/transitions/reef_spawning__abyss_midwaterexp.mp4
+++ b/simulator/sample_media/transitions/reef_spawning__abyss_midwaterexp.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e31751741a8ac8263b846a2ec67573f6370bb967370863e1e2c6868ac8390dd
-size 1295032
+oid sha256:c966ac375f027d87b3a4d569699a3d8a722955eda211fe49deda3dee1c72d6b9
+size 2412612
diff --git a/simulator/sample_media/transitions/reef_spawning__abyss_midwaterexp.rev.mp4 b/simulator/sample_media/transitions/reef_spawning__abyss_midwaterexp.rev.mp4
index d6fdc69..cb53cb4 100644
--- a/simulator/sample_media/transitions/reef_spawning__abyss_midwaterexp.rev.mp4
+++ b/simulator/sample_media/transitions/reef_spawning__abyss_midwaterexp.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac561a1b2f07ca68c3cd1406ac041cf579861f806135c1af8b765e3d8fb2d1f5
-size 1261352
+oid sha256:83660c3848c87d40531f87532f34d2d856a88fa225425b61e70ae4234654760b
+size 2282848
diff --git a/simulator/sample_media/transitions/reef_spawning__abyss_wow.mp4 b/simulator/sample_media/transitions/reef_spawning__abyss_wow.mp4
index 626f363..9029bff 100644
--- a/simulator/sample_media/transitions/reef_spawning__abyss_wow.mp4
+++ b/simulator/sample_media/transitions/reef_spawning__abyss_wow.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:981e055cb3c3a80a635ee45fa4db5e64e7533d4878e5d98238c70c2acf0cbf45
-size 1092545
+oid sha256:77138a6fd05b4395df0cec8401f0af105815269f928ad2f9b5404d17f11b073a
+size 2049841
diff --git a/simulator/sample_media/transitions/reef_spawning__abyss_wow.rev.mp4 b/simulator/sample_media/transitions/reef_spawning__abyss_wow.rev.mp4
index 62cb03f..3ee7d19 100644
--- a/simulator/sample_media/transitions/reef_spawning__abyss_wow.rev.mp4
+++ b/simulator/sample_media/transitions/reef_spawning__abyss_wow.rev.mp4
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:864157dc8a933b2a0a8d38496dd6f5ed0bd6722ec26381ae1fbfe9d5279cfdba
-size 1053704
+oid sha256:021c128c9ad5ce7d75f60df3dac3dad610d4b7a8d22ba7127fa98edb391cef84
+size 1914486
diff --git a/simulator/static/app.js b/simulator/static/app.js
index 9627887..947dc72 100644
--- a/simulator/static/app.js
+++ b/simulator/static/app.js
@@ -7,8 +7,22 @@
 const $ = (id) => document.getElementById(id);
 const vid = $("vid"), paint = $("paint"), tint = $("tint"), overlay = $("overlay"),
       black = $("black"), readout = $("readout");
+const loopVid = $("vid-loop");   // steady-state base loop element (double-buffer; #vid carries the scrub morphs)
 const affectLayer = $("affect");
 
+// The currently-displayed source element: the morph (#vid) while scrubbing (busy),
+// else the preloaded base loop (#vid-loop). The paint shader + fallback read this so
+// a landing is a source swap, never a reload of the on-screen element.
+function displayVid() { return busy ? vid : loopVid; }
+
+// Show the active source, hide the other (matters only in the WebGL-less fallback;
+// with the paint canvas it composites the active source anyway).
+function showActiveSource() {
+  const a = displayVid();
+  a.style.opacity = "1";
+  (a === vid ? loopVid : vid).style.opacity = "0";
+}
+
 // Right-dream state, read by the painterly render loop each frame. update() (debounced
 // on knob moves) writes these; the WebGL loop renders the live video continuously.
 let dreamIntensity = 0;    // 0..1 — painterly strength (and dream pastel/luminous)
@@ -214,17 +228,50 @@ function preloadChip() {
 // Load the active scale's BASE footage into the video (the painterly canvas reads
 // its frames live). The Right knob no longer swaps the source — it only drives the
 // deterministic dream restyle — so media reloads only when the SCALE changes.
+// Each baked morph reproduces the first LOOP_TAIL_S seconds of the destination clip
+// (pipeline `trim=0:3` in build_pool_manifest._make_transition), ending on that
+// clip's frame at ~LOOP_TAIL_S. So the STEADY-STATE loop must begin there, not at 0
+// — otherwise a landed morph (dst@~3s) jump-cuts back to dst@0 (the jitter). We loop
+// the base within [LOOP_TAIL_S, duration]: the morph's last frame hands straight off
+// to the loop's first frame, and the morph-covered intro never re-shows at rest.
+const LOOP_TAIL_S = 3.0;
+
+// Load a clip's base into the LOOP element (#vid-loop), seeked to the tail and PAUSED
+// on that exact frame. Idempotent per clip. Called during a scrub to PRELOAD the clip
+// we're about to land on, so settle just plays an already-decoded element at the morph's
+// last frame — no reload, no seek, no stall. `playLoop()` starts it at landing.
+function loadLoop(clip) {
+  if (!clip || loopVid.dataset.clip === clip.id) return;
+  loopVid.dataset.clip = clip.id;
+  loopVid.dataset.loopTail = "1";    // arm the [LOOP_TAIL_S, duration] wrap handler
+  loopVid.src = mediaUrl(clip.base_file);
+  loopVid.loop = false;              // native loop restarts at 0; we loop from the tail instead
+  loopVid.muted = true;
+  const seek = () => { try { loopVid.currentTime = LOOP_TAIL_S; } catch (e) { /* not seekable yet */ } };
+  if (loopVid.readyState >= 1) seek();
+  else loopVid.addEventListener("loadedmetadata", seek, { once: true });
+}
+
+function playLoop() {
+  if (loopVid.paused) loopVid.play().catch(() => {});
+}
+
 function ensureClipMedia() {
   const clip = activeClip();
-  if (!clip || clip.id === currentClipId) return;
+  if (!clip) return;
   currentClipId = clip.id;
-  vid.src = mediaUrl(clip.base_file);
-  vid.loop = true;
-  vid.muted = true;
-  vid.play().catch(() => {});
-  vid.style.opacity = "1";
+  loadLoop(clip);                    // idempotent: a no-op if the scrub already preloaded this clip
+  playLoop();                        // steady state runs the loop
 }
 
+// The custom loop on the LOOP element: when a base loop reaches the end, jump back to
+// the tail offset (not 0). The morph element (#vid) is driven directly by the scrub.
+loopVid.addEventListener("timeupdate", () => {
+  if (loopVid.dataset.loopTail === "1" && loopVid.duration && loopVid.currentTime >= loopVid.duration - 0.08) {
+    try { loopVid.currentTime = LOOP_TAIL_S; } catch (e) { /* not seekable */ }
+  }
+});
+
 // Compose the video look. The Right DREAM is now a painterly WebGL restyle of the
 // live frames (see the render loop below) — so here we only stash its intensity for
 // that loop, and build the Dark/Light mood grade as a CSS filter. The grade rides
@@ -238,8 +285,8 @@ function applyVideoLook(tone, dream) {
   gradeFilter = `brightness(${bright.toFixed(3)}) saturate(${sat.toFixed(3)}) sepia(${sepia.toFixed(3)})`;
   dreamIntensity = dream;
   tint.style.opacity = (cool * 0.6).toFixed(3);
-  // WebGL-less fallback: the canvas is hidden, so grade the visible #vid directly.
-  if (!paintOK) vid.style.filter = gradeFilter;
+  // WebGL-less fallback: the canvas is hidden, so grade the visible source directly.
+  if (!paintOK) displayVid().style.filter = gradeFilter;
 }
 
 // --- Right dream: real-time painterly restyle (WebGL2 Kuwahara) ---
@@ -327,11 +374,12 @@ function initPaint() {
   return true;
 }
 function paintLoop() {
-  if (paintOK && vid.readyState >= 2 && vid.videoWidth) {
-    const w = vid.videoWidth, h = vid.videoHeight;
+  const src = displayVid();          // morph while scrubbing, else the preloaded base loop
+  if (paintOK && src.readyState >= 2 && src.videoWidth) {
+    const w = src.videoWidth, h = src.videoHeight;
     if (paint.width !== w || paint.height !== h) { paint.width = w; paint.height = h; }
     gl.viewport(0, 0, w, h);
-    try { gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGB, gl.RGB, gl.UNSIGNED_BYTE, vid); } catch (_) {}
+    try { gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGB, gl.RGB, gl.UNSIGNED_BYTE, src); } catch (_) {}
     // No painterly restyle during a ring transition (busy) — show it raw.
     gl.uniform1f(uAmt, busy ? 0 : dreamIntensity);
     gl.uniform2f(uTexel, 1 / w, 1 / h);
@@ -415,7 +463,8 @@ function boxAt(a, t) {
 
 // Loop-normalized playback time of the base video (0..1), for track interpolation.
 function loopT() {
-  return vid && vid.duration ? (vid.currentTime % vid.duration) / vid.duration : 0;
+  const v = displayVid();
+  return v && v.duration ? (v.currentTime % v.duration) / v.duration : 0;
 }
 
 // --- Progressive labels & emotions (content-pipeline §11.3 / §11.4) ---
@@ -536,7 +585,7 @@ function controls() {
   const mood = +$("mood").value;
   return {
     visual: $("visual").checked ? "on" : "off",
-    audio: $("audio").checked ? "soundtrack" : "off",
+    audio: audioLevel() > 0 ? "soundtrack" : "off",
     // Back-compat: a server process predating the visual/audio split still requires
     // a 7-way `content` and would 422 the new payload. Send both — the current
     // server ignores `content`, an old one ignores visual/audio.
@@ -566,11 +615,12 @@ async function update() {
     // the <video>/<canvas> are GPU-composited and can otherwise show through the
     // overlay on a real GPU (Safari/Chrome).
     black.style.opacity = "1"; black.classList.remove("hidden");
-    vid.style.opacity = "0"; paint.style.opacity = "0";
+    vid.style.opacity = "0"; loopVid.style.opacity = "0"; paint.style.opacity = "0";
     return;
   }
   black.classList.add("hidden");
-  vid.style.opacity = ""; paint.style.opacity = "";    // restore the video layers
+  paint.style.opacity = "";                              // restore the painterly canvas
+  showActiveSource();                                    // show the active source (WebGL-less fallback)
 
   try {
     ensureClipMedia();
@@ -587,95 +637,32 @@ async function update() {
 
 function debounced() { clearTimeout(timer); timer = setTimeout(update, 80); }
 
-// --- Scale ring (endless encoder) ---
+// --- Scale ring (endless encoder, scrub-driven — see the scrub engine below) ---
 
-const FAST_BLEND_RATE = 2.5;   // playback speed for a collapsed fast-spin pass
+// Per-altitude duration of an AUTO transition (wheel / label-click). The total time
+// is PROPORTIONAL to the distance, so the speed between any two adjacent altitudes is
+// the same — a 2-altitude jump takes twice as long as a 1-altitude one. (A manual
+// drag is exempt: the operator drives its speed directly.)
+const PER_ALTITUDE_MS = 1200;
 
-function playTransition(file, blended, fromDeg, toDeg) {
-  // Play one resolved morph start-to-finish, with the alteration layers hidden.
-  // The manifest already encodes direction (forward zoom-in vs `.rev` zoom-out),
-  // so the file is played as-is. A `blended` (fast-spin) step runs at
-  // FAST_BLEND_RATE so a quick encoder spin lands fast. If no morph was baked for
-  // the pair (file null), resolve immediately so advance() plain-cuts. Resolves on
-  // 'ended' (or a safety timeout that scales with playback rate).
-  //
-  // When fromDeg/toDeg are given, the Altitude needle is swept from fromDeg to
-  // toDeg IN SYNC with the morph's playback progress — so the dial turns AS the
-  // transition happens and lands exactly when the morph ends (not before).
-  return new Promise((resolve) => {
-    const sweep = typeof fromDeg === "number" && typeof toDeg === "number";
-    if (!file) { if (sweep) setNeedle(toDeg); resolve(); return; }
-    overlay.style.opacity = "0";
-    affectLayer.style.opacity = "0";
-    tint.style.opacity = "0";
-    vid.style.filter = "none";
-    vid.loop = false;
-    vid.style.opacity = "1";
-    vid.src = mediaUrl(file);
-    vid.playbackRate = blended ? FAST_BLEND_RATE : 1;
-    let done = false, raf = 0;
-    const tickNeedle = () => {
-      const p = vid.duration ? Math.min(vid.currentTime / vid.duration, 1) : 0;
-      setNeedle(fromDeg + (toDeg - fromDeg) * p);
-      if (!done) raf = requestAnimationFrame(tickNeedle);
-    };
-    const finish = () => {
-      if (done) return;
-      done = true;
-      if (raf) cancelAnimationFrame(raf);
-      if (sweep) setNeedle(toDeg);          // land precisely on the detent
-      vid.removeEventListener("ended", finish);
-      vid.playbackRate = 1;
-      resolve();
-    };
-    vid.addEventListener("ended", finish);
-    vid.play().catch(finish);
-    if (sweep) raf = requestAnimationFrame(tickNeedle);
-    setTimeout(finish, blended ? 3000 : 6000);
-  });
-}
-
-// Advance the ring `delta` detents: pick the destination clip(s), play the matching
-// chained morph(s), then LOCK on the landed clip until the next altitude change.
-async function advance(delta) {
-  if (busy || !ring || ring.scales.length < 2) return;
-  busy = true;
-  const stepDeg = dialStep();
-  const dir = delta > 0 ? 1 : -1;
-  let curDeg = ringIndex * stepDeg;   // the pre-move detent angle
-  setNeedle(curDeg);                  // reset to the start detent so the needle sweeps WITH the morph (overrides any live drag pre-move)
-  try {
-    // The server chooses the destination clip(s) FIRST (threading the currently-
-    // shown clip in as from_clip_id), then returns the matching member->member
-    // morphs to play — chained through each crossed altitude.
-    const resp = await fetch("/api/ring/advance", {
-      method: "POST", headers: { "content-type": "application/json" },
-      body: JSON.stringify({ from_index: ringIndex, delta, from_clip_id: activeClipId }),
-    });
-    if (!resp.ok) return;
-    const move = await resp.json();
-    // Play each chained morph, sweeping the needle one detent per step IN SYNC with
-    // that morph's playback. A fast spin marks every step blended (played quick); a
-    // slow spin plays each at 1x. Each morph already ends on its destination clip's
-    // frame, so there is NO secondary swap.
-    for (const step of move.steps) {
-      const toDeg = curDeg + dir * stepDeg;
-      // Diagnostic seam: record the logical morph path played (the resolved URL may
-      // be an in-memory blob, so this is the reliable record for Dev Mode + E2E).
-      (window.__hefMorphs || (window.__hefMorphs = [])).push(step.file);
-      await playTransition(step.file, step.blended, curDeg, toDeg);
-      curDeg = toDeg;
-    }
-    ringIndex = move.to_index;
-    activeClipId = move.target_clip_id;   // LOCK on the landed clip — stays until the next altitude change
-    currentClipId = null;                 // force ensureClipMedia to (re)load + loop it
-    renderScaleReadout();                 // also renderDial(): snaps needle to the exact detent + active label
-  } finally {
-    busy = false;
-    update();                 // ensureClipMedia loads the locked clip; nothing re-rolls while parked
-    applyAudio();             // soundtrack follows the Altitude dial (crossfade to the new scale)
-    refreshReachablePreload();  // warm the morphs now reachable from the locked clip
-  }
+// Animate `pos` to a target at a constant per-altitude speed, driving the same scrub
+// path as a drag, then land exactly on the integer target (frac 0 settles + locks).
+let autoRaf = 0;
+function autoScrub(targetPos, perAltMs = PER_ALTITUDE_MS) {
+  if (!ring || ring.scales.length < 2) return;
+  if (autoRaf) cancelAnimationFrame(autoRaf);
+  const fromPos = pos, dist = targetPos - fromPos;
+  if (!dist) { setPos(targetPos); return; }
+  const ms = perAltMs * Math.abs(dist);          // constant per-altitude speed → N steps take N× as long
+  let startTs = null;
+  const tick = (ts) => {
+    if (startTs === null) startTs = ts;
+    const k = Math.min(1, (ts - startTs) / ms);
+    setPos(fromPos + dist * k);
+    if (k < 1) autoRaf = requestAnimationFrame(tick);
+    else { autoRaf = 0; setPos(targetPos); }     // land exactly + lock (frac 0)
+  };
+  autoRaf = requestAnimationFrame(tick);
 }
 
 let wheelAccum = 0, wheelTimer = null;
@@ -686,7 +673,7 @@ function onWheel(e) {
   wheelTimer = setTimeout(() => {
     const detents = Math.trunc(wheelAccum / 60) || (wheelAccum > 0 ? 1 : -1);
     wheelAccum = 0;
-    if (detents) advance(detents);   // wheel down = zoom inward (+)
+    if (detents) autoScrub(Math.round(pos) + detents);   // wheel down = descend (+); auto-scrub then lock
   }, 90);
 }
 
@@ -699,7 +686,17 @@ function onWheel(e) {
 const dial = $("dial");
 const DIAL_C = 50, DIAL_LABEL_R = 41, DIAL_BODY_R = 27;
 let needleDeg = 0;
-let dialDrag = null;          // {lastAng, accum, moved} while turning
+let dialDrag = null;          // {lastAng, accum, moved, restPos, target} while turning
+
+// --- Scrub engine state: the knob IS a continuous position ---
+let pos = 0;                  // continuous knob position; rest value == ringIndex
+let activeSeg = null;         // { lo, clipLo, clipHi, file } for the segment being scrubbed
+let seekPending = false;      // throttle: at most one currentTime seek per animation frame
+let scrubDir = 1;             // last travel direction (+1 descend / -1 ascend) — which end we'll land on
+
+// Diagnostic seam (sibling of window.__hefMorphs): the committed altitude state, so
+// E2E can assert the locked clip mid-scrub when #scale-name (settle-only) is stale.
+if (typeof window !== "undefined") window.__hefState = () => ({ ringIndex, activeClipId, pos });
 
 function dialStep() { return ring && ring.scales.length ? 360 / ring.scales.length : 360; }
 
@@ -763,10 +760,97 @@ function angDelta(a, b) {
   return d;
 }
 
+// A random pool member's clip_id for ring scale `index` (wrapped) — the client-side
+// destination pick (was the server's job in /api/ring/advance; moved here so the
+// scrub responds without a round-trip. `pick_clip_id` in player/ring.py stays the
+// canonical pure helper for the Pi player).
+function pickPoolClip(index) {
+  const n = ring.scales.length;
+  const s = ring.scales[HEFScrub.wrapIndex(index, n)];
+  const pool = (s.pool && s.pool.length) ? s.pool : [{ clip_id: s.clip_id }];
+  return pool[Math.floor(Math.random() * pool.length)].clip_id;
+}
+
+// Build (or re-roll) the segment [lo, lo+1]. The end equal to the rested altitude
+// (`enteredFrom`) keeps the locked clip; the OTHER end is a fresh random pick
+// (re-roll on fresh approach). The canonical file is always the descend/forward
+// morph clip@lo -> clip@lo+1, scrubbed bidirectionally (turn-back seeks it backward).
+function rebuildSegment(lo, enteredFrom) {
+  const n = ring.scales.length;
+  const atLo = HEFScrub.wrapIndex(lo, n), atHi = HEFScrub.wrapIndex(lo + 1, n);
+  const loId = (enteredFrom === atLo) ? activeClipId : pickPoolClip(lo);
+  const hiId = (enteredFrom === atHi) ? activeClipId : pickPoolClip(lo + 1);
+  const file = morphByPair[`${loId}→${hiId}`] || null;
+  activeSeg = { lo, clipLo: loId, clipHi: hiId, file };
+  if (file) {
+    overlay.style.opacity = "0";
+    affectLayer.style.opacity = "0";
+    tint.style.opacity = "0";
+    vid.style.filter = "none";
+    vid.loop = false;
+    if (vid.dataset.morph !== file) {
+      vid.dataset.morph = file;
+      vid.src = mediaUrl(file);
+      vid.pause();
+    }
+    // Diagnostic seam (matches advance()'s old record): the logical morph path
+    // played, reliable even when served from an in-memory blob.
+    (window.__hefMorphs || (window.__hefMorphs = [])).push(file);
+  }
+}
+
+// Drive the continuous position. Commits every integer crossed since the last
+// position (lock + re-roll), then either settles on an altitude (frac 0) or scrubs
+// the active segment's morph + audio by the fraction.
+function setPos(next) {
+  if (!ring || ring.scales.length < 2) return;
+  const n = ring.scales.length;
+  const dir = next > pos ? 1 : (next < pos ? -1 : scrubDir);   // travel direction (for which end we'll land on)
+  scrubDir = dir;
+  for (const c of HEFScrub.integerCrossings(pos, next)) {
+    ringIndex = HEFScrub.wrapIndex(c.index, n);
+    if (activeSeg) {
+      activeClipId = (HEFScrub.wrapIndex(activeSeg.lo, n) === ringIndex) ? activeSeg.clipLo : activeSeg.clipHi;
+    }
+    activeSeg = null;          // crossing ends the segment → next entry is a fresh approach (re-roll)
+  }
+  pos = next;
+  const { lo, frac } = HEFScrub.segmentOf(pos);
+  if (frac === 0) {            // settled exactly on an altitude → lock + base loop + single soundtrack
+    busy = false;
+    delete vid.dataset.morph;  // clear so re-entering the same segment reloads the morph (not the base)
+    currentClipId = null;      // force ensureClipMedia to reload + loop the locked clip
+    playLoop();                // the loop element was preloaded to this clip @ tail during the scrub → instant, no reload
+    showActiveSource();
+    setNeedle(ringIndex * dialStep());
+    renderScaleReadout();
+    update();                       // ensureClipMedia: idempotent loadLoop + keep the loop running
+    restAudio(ringIndex);
+    refreshReachablePreload();      // warm the morphs now reachable from the locked clip
+    return;
+  }
+  busy = true;                 // mid-morph: block update() from reloading the base clip under us
+  if (!activeSeg || activeSeg.lo !== lo) rebuildSegment(lo, ringIndex);
+  // Preload the clip we're heading toward into the LOOP element (paused @ tail) so the
+  // landing is a swap, not a reload+seek. dir>0 lands on clipHi, dir<0 on clipLo.
+  const headingId = dir > 0 ? activeSeg.clipHi : activeSeg.clipLo;
+  loadLoop(clipsById[headingId]);
+  showActiveSource();          // morph element is the live source while scrubbing
+  setNeedle(pos * dialStep());
+  blendAudio(lo, frac);
+  if (activeSeg.file && !seekPending) {       // throttle seeks to one per frame (avoid seek thrash)
+    seekPending = true;
+    requestAnimationFrame(() => {
+      seekPending = false;
+      if (vid.dataset.morph === activeSeg.file) vid.currentTime = HEFScrub.fracToTime(frac, vid.duration);
+    });
+  }
+}
+
 function onDialDown(e) {
-  if (busy || !ring || ring.scales.length < 2) return;
+  if (!ring || ring.scales.length < 2) return;
   e.preventDefault();
-  dialDrag = { lastAng: dialAngle(e), accum: 0, moved: 0, target: e.target };
+  dialDrag = { lastAng: dialAngle(e), accum: 0, moved: 0, target: e.target, restPos: pos };
 }
 function onDialMove(e) {
   if (!dialDrag) return;
@@ -775,33 +859,29 @@ function onDialMove(e) {
   dialDrag.lastAng = a;
   dialDrag.accum += d;
   dialDrag.moved += Math.abs(d);
-  // No live finger-follow: the needle should move ONLY with the transition (it
-  // sweeps in sync with the morph on commit — see advance()), so we don't rotate
-  // it ahead of the zoom here. We still accumulate `accum` to score the detents.
+  setPos(HEFScrub.accumToPos(dialDrag.restPos, dialDrag.accum, dialStep()));   // LIVE scrub: knob position IS the transition
 }
 function onDialUp(e) {
   if (!dialDrag) return;
-  const { accum, moved, target } = dialDrag;
+  const { moved, target } = dialDrag;
   dialDrag = null;
   if (moved < 6) {                                        // a tap, not a turn
     if (target && target.classList && target.classList.contains("dial-label")) {
       jumpToScale(+target.getAttribute("data-index"));
     }
-    renderDial();
     return;
   }
-  const detents = Math.round(accum / dialStep());
-  if (detents) advance(detents); else renderDial();      // snap back if it didn't cross a detent
+  // No auto-complete: hold the blend wherever the knob stopped (continuous-encoder model).
 }
 
-// Click a label → travel the SHORTEST signed way around the ring to that scale.
+// Click a label → auto-scrub the SHORTEST signed way around the ring to that scale.
 function jumpToScale(idx) {
   if (!ring) return;
   const n = ring.scales.length;
   let d = (idx - ringIndex) % n;
   if (d > n / 2) d -= n;
   if (d < -n / 2) d += n;
-  if (d) advance(d);
+  if (d) autoScrub(Math.round(pos) + d);
 }
 
 // --- Dev Mode: pool picker + live analysis, all under one toggle ---
@@ -902,8 +982,9 @@ function renderDevStats() {
   const total = preloadList().length;
   const cached = Object.keys(mediaBlobs).length;
   const fromMem = !!(c && mediaBlobs[c.base_file]);
-  const res = vid.videoWidth ? `${vid.videoWidth}×${vid.videoHeight}` : "—";
-  const dur = vid.duration ? `${vid.duration.toFixed(1)}s` : "—";
+  const dv = displayVid();
+  const res = dv.videoWidth ? `${dv.videoWidth}×${dv.videoHeight}` : "—";
+  const dur = dv.duration ? `${dv.duration.toFixed(1)}s` : "—";
   const loop = vid.duration ? `${Math.round(loopT() * 100)}%` : "—";
   dl.innerHTML =
     `<dt>cache</dt><dd>${cached}/${total} cached</dd>` +
@@ -956,47 +1037,79 @@ function devLiveReload() {
 // via the async server roundtrip; once unlocked it can be re-played programmatically
 // (e.g. on an altitude change). audio on = the current scale's soundtrack.
 const aud = $("aud");
-let audUrl = null;                      // soundtrack url currently loaded (null = silent)
+const audB = $("aud-b");                 // second element: the two crossfade by scrub fraction
 let audLastErr = "";                    // last play() rejection / element error (for the readout)
 const FADE_MS = 500;
 
+// Audio is a 0–10 level dial (was an on/off toggle). 0 = silent. The level is the
+// MASTER gain the per-scale soundtrack / crossfade is scaled by.
+function audioLevel() { return +$("audio").value || 0; }
+function audioVol() { return HEFScrub.clamp01(audioLevel() / 10); }
+function updateAudioLevelLabel() {
+  const el = $("audio-level-val");
+  if (el) el.textContent = String(audioLevel());
+}
+
+// The element currently carrying the most signal — for the diagnostic readout,
+// which used to assume a single `aud`. With two crossfading elements either may be
+// the audible one, so report on whichever is louder (ties → aud).
+function activeAudEl() { return audB.volume > aud.volume ? audB : aud; }
+
 // --- Live audio status readout (diagnostic) — so a "no sound" report is legible ---
 const AUD_ERR = ["", "aborted", "network", "decode", "format-not-supported"];
 function audioStatusText() {
-  if (!$("audio").checked) return "audio: off";
+  if (audioLevel() === 0) return "audio: off (level 0)";
   const s = ring && ring.scales[ringIndex];
   const url = soundtrackUrl();
-  const head = `ON · scale=${s ? s.id : "?"} · ring=${serverRing ? "server" : "SYNTH"} · url=${url || "NONE"}`;
+  const el = activeAudEl();
+  const head = `L${audioLevel()}/10 · scale=${s ? s.id : "?"} · ring=${serverRing ? "server" : "SYNTH"} · url=${url || "NONE"}`;
   if (!url) return "audio: " + head + " ← no soundtrack URL for this scale";
-  if (aud.error) return `audio: ${head} · MEDIA ERROR ${aud.error.code} (${AUD_ERR[aud.error.code] || "?"})`;
+  if (el.error) return `audio: ${head} · MEDIA ERROR ${el.error.code} (${AUD_ERR[el.error.code] || "?"})`;
   if (audLastErr) return `audio: ${head} · ${audLastErr}`;
-  if (aud.paused) return `audio: ${head} · PAUSED rs=${aud.readyState}`;
-  return `audio: ${head} · ▶ ${aud.currentTime.toFixed(1)}s vol=${Math.round(aud.volume * 100)}% rs=${aud.readyState}`;
+  if (el.paused) return `audio: ${head} · PAUSED rs=${el.readyState}`;
+  return `audio: ${head} · ▶ ${el.currentTime.toFixed(1)}s vol=${Math.round(el.volume * 100)}% rs=${el.readyState}`;
 }
 function updateAudioStatus() {
   const el = $("audio-status");
   if (!el) return;
   el.textContent = audioStatusText();
-  const playing = $("audio").checked && !!soundtrackUrl() && !aud.paused && !aud.error && !audLastErr;
+  const a = activeAudEl();
+  const on = audioLevel() > 0;
+  const playing = on && !!soundtrackUrl() && !a.paused && !a.error && !audLastErr;
   el.classList.toggle("playing", playing);
-  el.classList.toggle("blocked", $("audio").checked && (!soundtrackUrl() || !!aud.error || !!audLastErr));
+  el.classList.toggle("blocked", on && (!soundtrackUrl() || !!a.error || !!audLastErr));
 }
 aud.addEventListener("error", updateAudioStatus);
+audB.addEventListener("error", updateAudioStatus);
 setInterval(updateAudioStatus, 400);
 
+// Cancel any in-flight fade on an element. A fade is a setInterval ramping volume;
+// if a stale one keeps running after a new fade or a direct volume set, it drags the
+// element back toward its old target (e.g. a fade-to-0 on what becomes the ACTIVE
+// element silences it — the "audio off after landing" bug).
+function cancelFade(el) {
+  if (el._fadeIv) { clearInterval(el._fadeIv); el._fadeIv = null; }
+}
+
 function fadeVolume(el, to, ms, done) {
   // setInterval (not requestAnimationFrame): rAF throttles/pauses when the tab is
   // backgrounded, which would stall the gain ramp; a timer fires regardless.
+  cancelFade(el);                       // supersede any fade already running on this element
   const from = el.volume, steps = Math.max(1, Math.round(ms / 30));
   let i = 0;
   const iv = setInterval(() => {
     i += 1;
     const k = Math.min(1, i / steps);
     el.volume = Math.min(1, Math.max(0, from + (to - from) * k));
-    if (k >= 1) { clearInterval(iv); if (done) done(); }
+    if (k >= 1) { clearInterval(iv); el._fadeIv = null; if (done) done(); }
   }, 30);
+  el._fadeIv = iv;
 }
 
+// Diagnostic seam (sibling of window.__hefState): expose the fade so E2E can verify a
+// new fade supersedes a stale one rather than racing it.
+if (typeof window !== "undefined") window.__hefFade = fadeVolume;
+
 // Fallback per-scale soundtrack paths, used when the ring from /api/ring lacks the
 // `audio` field (e.g. a server process started before the audio field existed).
 // Mirrors simulator/build_pool_manifest.py SCALE_AUDIO — the 5 scales + files are
@@ -1009,43 +1122,81 @@ const SCALE_AUDIO_FALLBACK = {
   abyss: "abyss/whale.loop.mp3",
 };
 
-// The current altitude's soundtrack url: the ring's `audio` field, else the
-// scale-id fallback above.
-function soundtrackUrl() {
-  const s = ring && ring.scales[ringIndex];
-  if (!s) return null;
+// The soundtrack url for ring scale `index` (wrapped): the ring's `audio` field,
+// else the scale-id fallback above. `null` when there is no ring/scale.
+function scaleAudioUrl(index) {
+  if (!ring || !ring.scales.length) return null;
+  const s = ring.scales[HEFScrub.wrapIndex(index, ring.scales.length)];
   const a = s.audio || SCALE_AUDIO_FALLBACK[s.id];
   return a ? "/media/audio/" + a : null;
 }
+// The current resting altitude's soundtrack url (kept for the status readout).
+function soundtrackUrl() { return scaleAudioUrl(ringIndex); }
 
-// Load `url` into the single element and fade it in. Call this SYNCHRONOUSLY from
-// the toggle's click the first time so play() is allowed; later calls reuse the
-// now-unlocked element.
-function playUrl(url) {
-  aud.src = mediaUrl(url);
-  aud.volume = 0;
-  audLastErr = "";
-  const pr = aud.play();
-  if (pr) {
-    pr.then(() => { audLastErr = ""; updateAudioStatus(); })
-      .catch((e) => { audLastErr = "play BLOCKED: " + ((e && e.name) || e); updateAudioStatus(); });
+// Start (once) and set the volume of one element to a url. Safari needs the first
+// play() inside a user gesture; later programmatic plays reuse the unlocked element.
+// Only (re)loads `src` when the url actually changes (so a same-url call is a no-op
+// seek-wise and doesn't restart the loop).
+function ensurePlaying(el, url, vol) {
+  if (!url) { el.volume = 0; if (!el.paused) el.pause(); return; }
+  if (el.dataset.url !== url) {
+    el.dataset.url = url;
+    el.src = mediaUrl(url);
   }
-  fadeVolume(aud, 1, FADE_MS);
+  if (el.paused) {
+    audLastErr = "";
+    const pr = el.play();
+    if (pr) pr.then(() => { audLastErr = ""; updateAudioStatus(); })
+            .catch((e) => { audLastErr = "play BLOCKED: " + ((e && e.name) || e); updateAudioStatus(); });
+  }
+  cancelFade(el);                       // a direct volume set supersedes any in-flight fade on this element
+  el.volume = HEFScrub.clamp01(vol);
 }
 
-// Reconcile audio to the Audio toggle + current altitude: on → the scale's
-// soundtrack, off → silence. Idempotent on an unchanged url (so a same-scale pool
-// re-roll doesn't restart it). MUST be called synchronously from the toggle gesture
-// the first time it plays.
-function applyAudio() {
-  const url = $("audio").checked ? soundtrackUrl() : null;
-  if (url === audUrl) return;
-  audUrl = url;
-  if (!url) { fadeVolume(aud, 0, FADE_MS, () => aud.pause()); return; }
-  if (aud.paused || !aud.src) playUrl(url);             // start fresh
-  else fadeVolume(aud, 0, 250, () => playUrl(url));      // dip out, then swap + fade in
+// Pick which physical element carries each of the two needed urls, reusing the
+// element that already plays a url so a crossing reloads only the genuinely-new
+// scale (no restart click on the scale that persists across the boundary).
+function assignElements(urlLo, urlHi) {
+  if (aud.dataset.url === urlLo) return { elLo: aud, elHi: audB };
+  if (audB.dataset.url === urlLo) return { elLo: audB, elHi: aud };
+  if (aud.dataset.url === urlHi) return { elLo: audB, elHi: aud };
+  if (audB.dataset.url === urlHi) return { elLo: aud, elHi: audB };
+  return { elLo: aud, elHi: audB };
 }
 
+// Mid-segment: crossfade scale `loIndex` (gain 1-frac) against loIndex+1 (gain frac),
+// both scaled by the master audio level. No-op when the level is 0.
+function blendAudio(loIndex, frac) {
+  const lvl = audioVol();
+  if (lvl === 0) return;
+  const urlLo = scaleAudioUrl(loIndex), urlHi = scaleAudioUrl(loIndex + 1);
+  const g = HEFScrub.crossfadeGains(frac);
+  const { elLo, elHi } = assignElements(urlLo, urlHi);
+  ensurePlaying(elLo, urlLo, g.from * lvl);
+  ensurePlaying(elHi, urlHi, g.to * lvl);
+  updateAudioStatus();
+}
+
+// At rest on a single altitude: the element holding it plays at the master level, the
+// other fades out. Level 0 → both fade to silence.
+function restAudio(index) {
+  if (audioLevel() === 0) {
+    fadeVolume(aud, 0, FADE_MS, () => aud.pause());
+    fadeVolume(audB, 0, FADE_MS, () => audB.pause());
+    return;
+  }
+  const url = scaleAudioUrl(index);
+  const active = (audB.dataset.url === url) ? audB : aud;
+  const idle = active === audB ? aud : audB;
+  ensurePlaying(active, url, audioVol());
+  fadeVolume(idle, 0, FADE_MS);
+  updateAudioStatus();
+}
+
+// Reconcile audio to the Audio toggle + current resting altitude. MUST be called
+// synchronously from the toggle gesture the first time it plays (Safari unlock).
+function applyAudio() { restAudio(ringIndex); }
+
 // "Loading Universe…" splash — hidden once media is preloaded; reflects progress.
 function setLoadingProgress(done, total) {
   const fill = document.getElementById("loading-fill");
@@ -1070,16 +1221,18 @@ async function main() {
   renderScaleReadout();
   // Sliders stream on "input"; the toggles fire on "change".
   for (const id of ["left", "right", "mood"]) $(id).addEventListener("input", debounced);
-  // Audio toggle: start/stop the soundtrack SYNCHRONOUSLY in this gesture so it
-  // unlocks + plays on Safari (which blocks play() outside a user gesture).
-  $("audio").addEventListener("change", () => { applyAudio(); debounced(); });
-  // Video toggle: the FIRST time video turns on, bring audio with it (one flip = the
-  // full experience). Audio toggled on its own first stays audio-only. The audio is
-  // set + played in THIS gesture so it unlocks on Safari.
+  // Audio level dial: set the master soundtrack gain. Reconcile SYNCHRONOUSLY in this
+  // input gesture so the first raise from 0 unlocks + plays on Safari (which blocks
+  // play() outside a user gesture).
+  $("audio").addEventListener("input", () => { updateAudioLevelLabel(); applyAudio(); debounced(); });
+  updateAudioLevelLabel();
+  // Video toggle: the FIRST time video turns on, bring audio up to 3/10 with it (one
+  // flip = the full experience at a gentle level). If audio is already raised, leave it.
+  // Set + played in THIS gesture so it unlocks on Safari.
   $("visual").addEventListener("change", () => {
     if ($("visual").checked && !videoEverOn) {
       videoEverOn = true;
-      if (!$("audio").checked) { $("audio").checked = true; applyAudio(); }
+      if (audioLevel() === 0) { $("audio").value = "3"; updateAudioLevelLabel(); applyAudio(); }
     }
     debounced();
   });
diff --git a/simulator/static/index.html b/simulator/static/index.html
index efe32dd..90de2e9 100644
--- a/simulator/static/index.html
+++ b/simulator/static/index.html
@@ -18,7 +18,9 @@
     <section class="stage" id="stage">
       <div class="screen">
         <video id="vid" loop muted playsinline></video>
+        <video id="vid-loop" loop muted playsinline></video>
         <audio id="aud" loop preload="auto"></audio>
+        <audio id="aud-b" loop preload="auto"></audio>
         <canvas id="paint"></canvas>
         <div id="tint"></div>
         <svg id="overlay" viewBox="0 0 100 100" preserveAspectRatio="none"></svg>
@@ -35,10 +37,9 @@
           <span class="dev-switch-track"><span class="dev-switch-thumb"></span></span>
           <span class="dev-switch-label">Video</span>
         </label>
-        <label class="dev-switch" for="audio">
-          <input type="checkbox" id="audio" />
-          <span class="dev-switch-track"><span class="dev-switch-thumb"></span></span>
-          <span class="dev-switch-label">Audio</span>
+        <label class="audio-level">Audio
+          <input type="range" id="audio" min="0" max="10" value="0" step="1" />
+          <span id="audio-level-val">0</span>/10
         </label>
       </fieldset>
 
@@ -109,6 +110,7 @@
       </div>
     </section>
   </main>
+  <script src="/scrub.js"></script>
   <script src="/app.js"></script>
 </body>
 </html>
diff --git a/simulator/static/scrub.js b/simulator/static/scrub.js
new file mode 100644
index 0000000..f7f19cb
--- /dev/null
+++ b/simulator/static/scrub.js
@@ -0,0 +1,45 @@
+// Pure altitude-scrub math — no DOM. A continuous `pos` (float) is the knob:
+// integers are altitudes/detents, fractions are mid-morph blend. UMD so the
+// browser gets a `HEFScrub` global and `node --test` can require() it.
+(function (root, factory) {
+  const api = factory();
+  if (typeof module !== "undefined" && module.exports) module.exports = api;
+  else root.HEFScrub = api;
+})(typeof self !== "undefined" ? self : this, function () {
+  "use strict";
+
+  const clamp01 = (x) => Math.max(0, Math.min(1, x));
+  const wrapIndex = (i, n) => ((i % n) + n) % n;
+
+  function segmentOf(pos) {
+    const lo = Math.floor(pos);
+    return { lo, frac: pos - lo };
+  }
+
+  function accumToPos(restPos, accumDeg, stepDeg) {
+    return restPos + accumDeg / stepDeg;
+  }
+
+  function fracToTime(frac, duration) {
+    return clamp01(frac) * (duration || 0);
+  }
+
+  function crossfadeGains(frac) {
+    const f = clamp01(frac);
+    return { from: 1 - f, to: f };
+  }
+
+  // Integers strictly crossed moving prevPos -> pos, in travel order. Landing
+  // exactly on an integer counts as crossing it (it commits that altitude).
+  function integerCrossings(prevPos, pos) {
+    const out = [];
+    if (pos > prevPos) {
+      for (let k = Math.floor(prevPos) + 1; k <= pos + 1e-9; k++) out.push({ index: k, dir: 1 });
+    } else if (pos < prevPos) {
+      for (let k = Math.ceil(prevPos) - 1; k >= pos - 1e-9; k--) out.push({ index: k, dir: -1 });
+    }
+    return out;
+  }
+
+  return { clamp01, wrapIndex, segmentOf, accumToPos, fracToTime, crossfadeGains, integerCrossings };
+});
diff --git a/simulator/static/style.css b/simulator/static/style.css
index 6c96e27..a4971a1 100644
--- a/simulator/static/style.css
+++ b/simulator/static/style.css
@@ -7,7 +7,11 @@ main { display: flex; gap: 1rem; padding: 1rem; flex-wrap: wrap; align-items: fl
 .stage { flex: 1 1 640px; position: sticky; top: 1rem; }
 .screen { position: relative; width: 100%; aspect-ratio: 16 / 9; background: #000;
           border-radius: 6px; overflow: hidden; }
-#vid { width: 100%; height: 100%; object-fit: cover; transition: opacity 0.15s ease; }
+/* Two stacked source videos: #vid plays the scrub morphs, #vid-loop the steady-state
+   base loop, preloaded during a scrub so landing is a swap (no reload stall). The
+   paint canvas (WebGL) composites whichever is active; in the WebGL-less fallback the
+   active one is shown via opacity. */
+#vid, #vid-loop { position: absolute; inset: 0; width: 100%; height: 100%; object-fit: cover; transition: opacity 0.15s ease; }
 /* Right-dream painterly canvas: a WebGL Kuwahara restyle of the LIVE video frames,
    drawn over the base. Edge-preserving, so motion stays as crisp as the source —
    the dream is the same footage, just stylized. The mood grade rides as a CSS
@@ -93,6 +97,11 @@ input[type=range], select { width: 100%; }
 .dev-switch input:checked + .dev-switch-track .dev-switch-thumb { transform: translateX(16px); background: #4e9; }
 .dev-switch input:focus-visible + .dev-switch-track { outline: 2px solid #9af; outline-offset: 1px; }
 .dev-switch-label { color: #9af; font-weight: 600; letter-spacing: 0.3px; }
+/* Audio level dial (0–10): label · slider · value on one row, matching the switch look. */
+.audio-level { display: flex; align-items: center; gap: 0.5rem; margin-top: 0.45rem;
+               color: #9af; font-weight: 600; letter-spacing: 0.3px; }
+.audio-level input[type=range] { flex: 1; width: auto; }
+#audio-level-val { font-variant-numeric: tabular-nums; min-width: 1.2em; text-align: right; }
 .dev-panel { display: flex; flex-direction: column; gap: 0.8rem; }
 /* Beat the generic `.hidden` (defined earlier, equal specificity): two classes
    win, so the panel truly collapses when Dev Mode is off. */
diff --git a/simulator/unit/README.md b/simulator/unit/README.md
new file mode 100644
index 0000000..cc18b42
--- /dev/null
+++ b/simulator/unit/README.md
@@ -0,0 +1,8 @@
+# Simulator unit tests
+
+Pure-logic JS unit tests (no browser), run with Node's built-in test runner:
+
+    node --test simulator/unit/*.test.js
+
+`scrub.test.js` covers `simulator/static/scrub.js` — the pure altitude-scrub math
+(position→segment, frac→currentTime, audio gains, integer-crossing detection).
diff --git a/simulator/unit/scrub.test.js b/simulator/unit/scrub.test.js
new file mode 100644
index 0000000..039120d
--- /dev/null
+++ b/simulator/unit/scrub.test.js
@@ -0,0 +1,60 @@
+"use strict";
+const test = require("node:test");
+const assert = require("node:assert/strict");
+const S = require("../static/scrub.js");
+
+test("clamp01 bounds to [0,1]", () => {
+  assert.equal(S.clamp01(-0.2), 0);
+  assert.equal(S.clamp01(0.4), 0.4);
+  assert.equal(S.clamp01(1.5), 1);
+});
+
+test("wrapIndex wraps both directions", () => {
+  assert.equal(S.wrapIndex(0, 5), 0);
+  assert.equal(S.wrapIndex(5, 5), 0);
+  assert.equal(S.wrapIndex(-1, 5), 4);
+  assert.equal(S.wrapIndex(7, 5), 2);
+});
+
+test("segmentOf splits floor and fraction", () => {
+  assert.deepEqual(S.segmentOf(2), { lo: 2, frac: 0 });
+  const s = S.segmentOf(2.4);
+  assert.equal(s.lo, 2);
+  assert.ok(Math.abs(s.frac - 0.4) < 1e-9);
+});
+
+test("accumToPos maps knob degrees to position", () => {
+  assert.equal(S.accumToPos(2, 0, 72), 2);
+  assert.equal(S.accumToPos(2, 72, 72), 3);
+  assert.equal(S.accumToPos(2, -36, 72), 1.5);
+});
+
+test("fracToTime clamps and scales by duration", () => {
+  assert.equal(S.fracToTime(0, 1.5), 0);
+  assert.equal(S.fracToTime(0.5, 1.5), 0.75);
+  assert.equal(S.fracToTime(1.2, 1.5), 1.5);
+  assert.equal(S.fracToTime(0.5, 0), 0);
+});
+
+test("crossfadeGains splits energy by fraction", () => {
+  assert.deepEqual(S.crossfadeGains(0), { from: 1, to: 0 });
+  assert.deepEqual(S.crossfadeGains(1), { from: 0, to: 1 });
+  assert.deepEqual(S.crossfadeGains(0.25), { from: 0.75, to: 0.25 });
+});
+
+test("integerCrossings: none while inside a segment", () => {
+  assert.deepEqual(S.integerCrossings(2.1, 2.9), []);
+  assert.deepEqual(S.integerCrossings(2.0, 2.5), []);
+  assert.deepEqual(S.integerCrossings(3.0, 2.5), []);
+});
+
+test("integerCrossings: ascending and descending single crossings", () => {
+  assert.deepEqual(S.integerCrossings(2.4, 3.0), [{ index: 3, dir: 1 }]);
+  assert.deepEqual(S.integerCrossings(2.0, 3.0), [{ index: 3, dir: 1 }]);
+  assert.deepEqual(S.integerCrossings(3.4, 3.0), [{ index: 3, dir: -1 }]);
+});
+
+test("integerCrossings: multiple crossings in travel order", () => {
+  assert.deepEqual(S.integerCrossings(2.4, 4.1), [{ index: 3, dir: 1 }, { index: 4, dir: 1 }]);
+  assert.deepEqual(S.integerCrossings(3.2, 1.8), [{ index: 3, dir: -1 }, { index: 2, dir: -1 }]);
+});
diff --git a/tests/test_build_pool_manifest.py b/tests/test_build_pool_manifest.py
index 247f883..c406490 100644
--- a/tests/test_build_pool_manifest.py
+++ b/tests/test_build_pool_manifest.py
@@ -54,3 +54,17 @@ def test_generate_media_bakes_every_member_pair(monkeypatch, tmp_path):
            for h in b.POOLS[H] for l in b.POOLS[L]}
     assert fwd <= outs and rev <= outs
     assert len(fwd) + len(rev) == 154
+
+
+def test_transition_cmd_is_all_intra():
+    cmd = b.transition_cmd("ffmpeg", "/a/base.mp4", "/b/base.mp4", "/out/x__y.mp4")
+    assert "-g" in cmd and cmd[cmd.index("-g") + 1] == "1"
+    assert "-keyint_min" in cmd and cmd[cmd.index("-keyint_min") + 1] == "1"
+    assert "-sc_threshold" in cmd and cmd[cmd.index("-sc_threshold") + 1] == "0"
+    assert "libx264" in cmd
+
+
+def test_reverse_cmd_is_all_intra():
+    cmd = b.reverse_cmd("ffmpeg", "/out/x__y.mp4", "/out/x__y.rev.mp4")
+    assert "-g" in cmd and cmd[cmd.index("-g") + 1] == "1"
+    assert "reverse" in " ".join(cmd)