refactor(progress bar): reset when event changes

2026-08-02 22:18:08 +00:00 · 2026-08-01 12:52:45 +02:00
20 changed files with 350 additions and 412 deletions
@@ -9,6 +9,7 @@ import './MultiPartProgressBar.scss';
 interface MultiPartProgressBar {
  now: MaybeNumber;
  complete: MaybeNumber;
+  eventId?: string | null;
  normalColor: string;
  warning?: MaybeNumber;
  warningColor: string;
@@ -24,6 +25,7 @@ export default function MultiPartProgressBar(props: MultiPartProgressBar) {
  const {
    now,
    complete,
+    eventId,
    normalColor,
    warning,
    warningColor,
@@ -35,7 +37,7 @@ export default function MultiPartProgressBar(props: MultiPartProgressBar) {
    className = '',
  } = props;

-  const percentRemaining = 100 - useAnimatedProgress(now, complete);
+  const percentRemaining = 100 - useAnimatedProgress(now, complete, eventId);
  const dangerWidth = danger ? 100 - getProgress(danger, complete) : 0;
  const warningWidth = warning ? 100 - dangerWidth - getProgress(warning, complete) : 0;
  const isOvertime = now !== null && now < 0;
@@ -7,12 +7,12 @@ import './ProgressBar.scss';
 interface ProgressBarProps {
  current: MaybeNumber;
  duration: MaybeNumber;
+  eventId?: string | null;
  className?: string;
 }

-export default function ProgressBar(props: ProgressBarProps) {
-  const { current, duration, className } = props;
-  const progress = useAnimatedProgress(current, duration);
+export default function ProgressBar({ current, duration, eventId, className }: ProgressBarProps) {
+  const progress = useAnimatedProgress(current, duration, eventId);

  return (
    <div className={`progress-bar__bg ${className}`}>
@@ -1,26 +1,34 @@
-import { MaybeNumber, Playback } from 'ontime-types';
+import { EntryId, MaybeNumber, Playback } from 'ontime-types';
 import { useEffect, useRef, useState } from 'react';

 import { getProgress } from '../utils/getProgress';
-import { usePlayback } from './useSocket';
+import { useIsOnline, usePlayback } from './useSocket';

 /**
 * Returns the live completion percentage (0–100) of a countdown, interpolated locally.
 */
-export function useAnimatedProgress(current: MaybeNumber, duration: MaybeNumber): number {
+export function useAnimatedProgress(current: MaybeNumber, duration: MaybeNumber, eventId?: EntryId | null): number {
  const playback = usePlayback();
+  const isOnline = useIsOnline();
  const isRunning = playback === Playback.Play || playback === Playback.Roll;

-  const baseline = useRef({ current, at: performance.now() });
+  const baseline = useRef({ current, duration, eventId, playback, at: performance.now() });
  const [, setTick] = useState(0);
+  const now = performance.now();

-  // there is only something to animate while a running timer is counting down towards 0
-  const shouldAnimate = isRunning && current !== null && current > 0 && duration !== null;
+  const hasAuthoritativeUpdate =
+    baseline.current.current !== current || // handle timer updates
+    baseline.current.duration !== duration || // handle duration changes
+    baseline.current.eventId !== eventId || // handle event changing
+    baseline.current.playback !== playback; // handle playback changes

-  // re-anchor to the authoritative value whenever the server pushes a new timer update
-  useEffect(() => {
-    baseline.current = { current, at: performance.now() };
-  }, [current, duration, playback]);
+  if (hasAuthoritativeUpdate) {
+    // Reset during render so an event change is reflected in this very paint.
+    baseline.current = { current, duration, eventId, playback, at: now };
+  }
+
+  // There is only something to animate while a connected timer is counting down towards 0.
+  const shouldAnimate = isOnline && isRunning && current !== null && current > 0 && duration !== null;

  // while counting down, re-render every animation frame so the derived progress stays smooth
  useEffect(() => {
@@ -34,8 +42,8 @@ export function useAnimatedProgress(current: MaybeNumber, duration: MaybeNumber)
    return () => cancelAnimationFrame(frame);
  }, [shouldAnimate]);

-  // derive from the anchor plus elapsed time at render; frozen to the anchor when not running
+  // Derive from the anchor plus elapsed time at render; freeze while disconnected or not running.
  const anchored = baseline.current.current;
-  const value = isRunning && anchored !== null ? anchored - (performance.now() - baseline.current.at) : anchored;
+  const value = isOnline && isRunning && anchored !== null ? anchored - (now - baseline.current.at) : anchored;
  return getProgress(value, duration);
 }
@@ -163,6 +163,7 @@ export const useNextFlag = createSelector((state: RuntimeStore) => ({
 export const useProgressData = createSelector((state: RuntimeStore) => ({
  current: state.timer.current,
  duration: state.timer.duration,
+  eventId: state.eventNow?.id ?? null,
  timeWarning: state.eventNow?.timeWarning ?? null,
  timeDanger: state.eventNow?.timeDanger ?? null,
 }));
@@ -10,12 +10,13 @@ interface StatusBarProgressProps {
 }

 export default function StatusBarProgress({ viewSettings }: StatusBarProgressProps) {
-  const { current, duration, timeWarning, timeDanger } = useProgressData();
+  const { current, duration, eventId, timeWarning, timeDanger } = useProgressData();

  return (
    <MultiPartProgressBar
      now={current}
      complete={duration}
+      eventId={eventId}
      normalColor={viewSettings.normalColor}
      warning={timeWarning}
      warningColor={viewSettings.warningColor}
@@ -1,12 +1,13 @@
 import { useAnimatedProgress } from '../../../../common/hooks/useAnimatedProgress';
-import { useTimer } from '../../../../common/hooks/useSocket';
+import { useSelectedEventId, useTimer } from '../../../../common/hooks/useSocket';

 import style from './RundownEventProgressBar.module.scss';

 export default function RundownEventProgressBar() {
  const timer = useTimer();
+  const eventId = useSelectedEventId();

-  const progress = useAnimatedProgress(timer.current, timer.duration);
+  const progress = useAnimatedProgress(timer.current, timer.duration, eventId);

  return <div className={style.progressBar} style={{ width: `${progress}%` }} />;
 }
@@ -112,7 +112,14 @@ function Backstage({ events, customFields, projectData, isMirrored, settings }:
        <BackstageClock timeformat={timeformat} />
      </div>

-      {showProgress && <ProgressBar className='progress-container' current={time.current} duration={time.duration} />}
+      {showProgress && (
+        <ProgressBar
+          className='progress-container'
+          current={time.current}
+          duration={time.duration}
+          eventId={selectedEventId}
+        />
+      )}

      {!hasEvents && <Empty text={getLocalizedString('common.no_data')} className='empty-container' />}

@@ -6,12 +6,13 @@ import styles from './CuesheetProgress.module.scss';

 export default function CuesheetProgress() {
  const { data } = useViewSettings();
-  const { current, duration, timeWarning, timeDanger } = useProgressData();
+  const { current, duration, eventId, timeWarning, timeDanger } = useProgressData();

  return (
    <MultiPartProgressBar
      now={current}
      complete={duration}
+      eventId={eventId}
      normalColor={data.normalColor}
      warning={timeWarning}
      warningColor={data.warningColor}
@@ -96,6 +96,7 @@ export function PipTimer({ viewSettings }: PipTimerProps) {
          className={cx(['progress-container', !isPlaying && 'progress-container--paused'])}
          now={time.current}
          complete={totalTime}
+          eventId={eventNow?.id}
          normalColor={viewSettings.normalColor}
          warning={eventNow?.timeWarning}
          warningColor={viewSettings.warningColor}
@@ -2,7 +2,7 @@ import { Day } from 'ontime-types';
 import { CSSProperties, RefObject } from 'react';

 import { useAnimatedProgress } from '../../common/hooks/useAnimatedProgress';
-import { useExpectedStartData, useTimer } from '../../common/hooks/useSocket';
+import { useExpectedStartData, useSelectedEventId, useTimer } from '../../common/hooks/useSocket';
 import { alpha, cx } from '../../common/utils/styleUtils';
 import { formatDuration, formatTime, getExpectedTimesFromExtendedEvent } from '../../common/utils/time';
 import { useTranslation } from '../../translation/TranslationProvider';
@@ -169,7 +169,8 @@ function TimelineEntryStatus({
 /** Generates a block level progress bar */
 function ActiveBlock() {
  const { current, duration } = useTimer();
-  const progress = useAnimatedProgress(current, duration);
+  const eventId = useSelectedEventId();
+  const progress = useAnimatedProgress(current, duration, eventId);
  return (
    <div data-status='live' className={style.timelineBlock} style={{ '--progress': `${progress}%` } as CSSProperties} />
  );
@@ -195,6 +195,7 @@ function Timer({ customFields, projectData, isMirrored, settings, viewSettings,
          className={cx(['progress-container', !isPlaying && 'progress-container--paused'])}
          now={time.current}
          complete={totalTime}
+          eventId={eventNow?.id}
          normalColor={viewSettings.normalColor}
          warning={eventNow?.timeWarning}
          warningColor={viewSettings.warningColor}
@@ -1,5 +1,5 @@
 import { Day, Duration, Instant, TimeOfDay } from 'ontime-types';
-import { MILLIS_PER_HOUR, MILLIS_PER_MINUTE, MILLIS_PER_SECOND, dayInMs } from 'ontime-utils';
+import { MILLIS_PER_MINUTE, dayInMs } from 'ontime-utils';

 /** Returns the current instant */
 export function now(): Instant {
@@ -59,10 +59,6 @@ export function addDuration(instant: Instant, duration: Duration | Duration[]):
  return (instant + totalDuration) as Instant;
 }

-export function combineValues<T extends Duration | Day>(...duration: T[]): T {
-  return Array.isArray(duration) ? (duration.reduce<number>((total, current) => total + current, 0) as T) : duration;
-}
-
 /**
 * Calculates elapsed time on the clock from a starting time to the current time
 * Handles overnight crossing (when current < start, assumes we've crossed midnight)
@@ -84,15 +80,3 @@ export function daysSinceStart(startEpoch: Instant, currentEpoch: Instant): Day

  return (currentDaySerial - startDaySerial) as Day;
 }
-
-export const ZERO_DURATION = 0 as Duration;
-
-/**
- * utility function to generate Instant times
- */
-export function generateInstanceFromClock(hour: number, minutes: number, second: number, ms = 0) {
-  return toInstant(
-    (hour * MILLIS_PER_HOUR + minutes * MILLIS_PER_MINUTE + second * MILLIS_PER_SECOND + ms) as TimeOfDay,
-    now(),
-  );
-}
@@ -1,8 +1,7 @@
-import { Duration, EndAction, Playback, TimeOfDay, TimeStrategy, TimerPhase, TimerType } from 'ontime-types';
+import { EndAction, Playback, TimeOfDay, TimeStrategy, TimerPhase, TimerType } from 'ontime-types';
 import { MILLIS_PER_HOUR, MILLIS_PER_MINUTE, MILLIS_PER_SECOND, dayInMs, millisToString } from 'ontime-utils';

-import * as timeCore from '../../lib/time-core/timeCore.js';
-import type { InternalRuntimeState, RuntimeState } from '../../stores/runtimeState.js';
+import type { RuntimeState } from '../../stores/runtimeState.js';
 import {
  findDayOffset,
  getCurrent,
@@ -20,48 +19,48 @@ const asTimeOfDay = (value: number): RuntimeState['clock'] => value as RuntimeSt
 describe('getElapsed()', () => {
  it('returns active elapsed time from startedAt without add-time adjustments', () => {
    const state = {
-      _now: timeCore.generateInstanceFromClock(0, 5, 0),
+      clock: 5 * MILLIS_PER_MINUTE,
      timer: {
        addedTime: -10 * MILLIS_PER_MINUTE,
        current: 15 * MILLIS_PER_MINUTE,
        duration: 20 * MILLIS_PER_MINUTE,
-        startedAt: timeCore.generateInstanceFromClock(0, 2, 0),
+        startedAt: 2 * MILLIS_PER_MINUTE,
      },
      _timer: {
        pausedAt: null,
        pausedDuration: 0,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    expect(getElapsed(state)).toBe(3 * MILLIS_PER_MINUTE);
  });

  it('subtracts accumulated pause time', () => {
    const state = {
-      _now: timeCore.generateInstanceFromClock(0, 10, 0),
+      clock: 10 * MILLIS_PER_MINUTE,
      timer: {
-        startedAt: timeCore.generateInstanceFromClock(0, 2, 0),
+        startedAt: 2 * MILLIS_PER_MINUTE,
      },
      _timer: {
        pausedAt: null,
        pausedDuration: 5 * MILLIS_PER_MINUTE,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    expect(getElapsed(state)).toBe(3 * MILLIS_PER_MINUTE);
  });

  it('uses the current pause start while paused', () => {
    const state = {
-      _now: timeCore.generateInstanceFromClock(0, 10, 0),
+      clock: 10 * MILLIS_PER_MINUTE,
      timer: {
-        startedAt: timeCore.generateInstanceFromClock(0, 2, 0),
+        startedAt: 2 * MILLIS_PER_MINUTE,
      },
      _timer: {
        pausedAt: 7 * MILLIS_PER_MINUTE,
        pausedDuration: 1 * MILLIS_PER_MINUTE,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    expect(getElapsed(state)).toBe(4 * MILLIS_PER_MINUTE);
  });
@@ -83,7 +82,7 @@ describe('getExpectedFinish()', () => {
        pausedAt: null,
        hasFinished: false,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;
    const calculatedFinish = getExpectedFinish(state);
    expect(calculatedFinish).toBe(null);
  });
@@ -96,13 +95,13 @@ describe('getExpectedFinish()', () => {
      timer: {
        addedTime: 0,
        duration: 10,
-        startedAt: timeCore.generateInstanceFromClock(0, 0, 0, 10),
+        startedAt: 10,
      },
      _timer: {
        pausedAt: null,
        hasFinished: true,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;
    const calculatedFinish = getExpectedFinish(state);
    expect(calculatedFinish).toBe(20);
  });
@@ -115,13 +114,13 @@ describe('getExpectedFinish()', () => {
      timer: {
        addedTime: 0,
        duration: 10,
-        startedAt: timeCore.generateInstanceFromClock(0, 0, 0, 1),
+        startedAt: 1,
      },
      _timer: {
        pausedAt: null,
        hasFinished: false,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;
    const calculatedFinish = getExpectedFinish(state);
    expect(calculatedFinish).toBe(11);
  });
@@ -134,13 +133,13 @@ describe('getExpectedFinish()', () => {
      timer: {
        addedTime: 20,
        duration: 10,
-        startedAt: timeCore.generateInstanceFromClock(0, 0, 0, 1),
+        startedAt: 1,
      },
      _timer: {
        pausedAt: null,
        hasFinished: false,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const calculatedFinish = getExpectedFinish(state);
    expect(calculatedFinish).toBe(31);
@@ -154,13 +153,13 @@ describe('getExpectedFinish()', () => {
      timer: {
        addedTime: -10,
        duration: 10,
-        startedAt: timeCore.generateInstanceFromClock(0, 0, 0, 1),
+        startedAt: 1,
      },
      _timer: {
        pausedAt: null,
        hasFinished: false,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const calculatedFinish = getExpectedFinish(state);
    expect(calculatedFinish).toBe(1);
@@ -174,13 +173,13 @@ describe('getExpectedFinish()', () => {
      timer: {
        addedTime: -100,
        duration: 10,
-        startedAt: timeCore.generateInstanceFromClock(0, 0, 0, 1),
+        startedAt: 1,
      },
      _timer: {
        pausedAt: null,
        hasFinished: false,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const calculatedFinish = getExpectedFinish(state);
    expect(calculatedFinish).toBe(1);
@@ -194,13 +193,13 @@ describe('getExpectedFinish()', () => {
      timer: {
        addedTime: 0,
        duration: 0,
-        startedAt: timeCore.generateInstanceFromClock(0, 0, 0, 1),
+        startedAt: 1,
      },
      _timer: {
        pausedAt: null,
        hasFinished: false,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const calculatedFinish = getExpectedFinish(state);
    expect(calculatedFinish).toBe(1);
@@ -214,13 +213,13 @@ describe('getExpectedFinish()', () => {
      timer: {
        addedTime: 0,
        duration: dayInMs,
-        startedAt: timeCore.generateInstanceFromClock(0, 0, 0, 10),
+        startedAt: 10,
      },
      _timer: {
        pausedAt: null,
        hasFinished: false,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const calculatedFinish = getExpectedFinish(state);
    expect(calculatedFinish).toBe(10);
@@ -235,13 +234,13 @@ describe('getExpectedFinish()', () => {
        timer: {
          addedTime: 10,
          duration: dayInMs,
-          startedAt: timeCore.generateInstanceFromClock(0, 0, 0, 10),
+          startedAt: 10,
        },
        _timer: {
          pausedAt: null,
          hasFinished: false,
        },
-      } as InternalRuntimeState;
+      } as RuntimeState;

      const calculatedFinish = getExpectedFinish(state);
      expect(calculatedFinish).toBe(40);
@@ -254,7 +253,7 @@ describe('getExpectedFinish()', () => {
        },
        timer: {
          addedTime: 0,
-          startedAt: timeCore.generateInstanceFromClock(22, 0, 0),
+          startedAt: 79200000, // 22:00:00
        },
        _timer: {
          pausedAt: null,
@@ -264,7 +263,7 @@ describe('getExpectedFinish()', () => {
          actualStart: 79200000,
          plannedEnd: 600000,
        },
-      } as InternalRuntimeState;
+      } as RuntimeState;

      const calculatedFinish = getExpectedFinish(state);
      // expected finish is not a duration but a point in time
@@ -280,7 +279,7 @@ describe('getCurrent()', () => {
        timeEnd: 30,
        timerType: TimerType.CountDown,
      },
-      _now: timeCore.generateInstanceFromClock(0, 0, 0),
+      clock: 0,
      timer: {
        addedTime: 10,
        duration: 111, // <-- we take the duration value
@@ -290,7 +289,7 @@ describe('getCurrent()', () => {
        pausedAt: null,
        hasFinished: false,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const current = getCurrent(state);
    expect(current).toBe(111);
@@ -301,17 +300,17 @@ describe('getCurrent()', () => {
        timeEnd: 10,
        timerType: TimerType.CountDown,
      },
-      _now: timeCore.generateInstanceFromClock(0, 0, 0, 1),
+      clock: 1,
      timer: {
        addedTime: 0,
        duration: 10,
-        startedAt: timeCore.generateInstanceFromClock(0, 0, 0),
+        startedAt: 0,
      },
      _timer: {
        pausedAt: null,
        hasFinished: false,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const current = getCurrent(state);
    expect(current).toBe(9);
@@ -322,17 +321,17 @@ describe('getCurrent()', () => {
        timeEnd: 10,
        timerType: TimerType.CountDown,
      },
-      _now: timeCore.generateInstanceFromClock(0, 0, 0, 1),
+      clock: 1,
      timer: {
        addedTime: 10,
        duration: 10,
-        startedAt: timeCore.generateInstanceFromClock(0, 0, 0),
+        startedAt: 0,
      },
      _timer: {
        pausedAt: null,
        hasFinished: false,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const current = getCurrent(state);
    expect(current).toBe(19);
@@ -343,17 +342,17 @@ describe('getCurrent()', () => {
        timeEnd: 20,
        timerType: TimerType.CountDown,
      },
-      _now: timeCore.generateInstanceFromClock(0, 0, 0, 10),
+      clock: 10,
      timer: {
        addedTime: 0,
        duration: dayInMs + 10,
-        startedAt: timeCore.generateInstanceFromClock(0, 0, 0, 10),
+        startedAt: 10,
      },
      _timer: {
        pausedAt: null,
        hasFinished: false,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const current = getCurrent(state);
    expect(current).toBe(dayInMs + 10);
@@ -364,17 +363,17 @@ describe('getCurrent()', () => {
        timeEnd: 20,
        timerType: TimerType.CountDown,
      },
-      _now: timeCore.generateInstanceFromClock(0, 0, 0, 5),
+      clock: 5,
      timer: {
        addedTime: 0,
        duration: dayInMs + 10,
-        startedAt: timeCore.generateInstanceFromClock(0, 0, 0, 10),
+        startedAt: 10,
      },
      _timer: {
        pausedAt: null,
        hasFinished: false,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const current = getCurrent(state);
    expect(current).toBe(15);
@@ -385,17 +384,17 @@ describe('getCurrent()', () => {
        timeEnd: 20,
        timerType: TimerType.CountDown,
      },
-      _now: timeCore.generateInstanceFromClock(0, 0, 0, 5),
+      clock: 5,
      timer: {
        addedTime: 20,
        duration: dayInMs + 10,
-        startedAt: timeCore.generateInstanceFromClock(0, 0, 0, 10),
+        startedAt: 10,
      },
      _timer: {
        pausedAt: null,
        hasFinished: false,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const current = getCurrent(state);
    expect(current).toBe(35);
@@ -408,7 +407,7 @@ describe('getCurrent()', () => {
          timeEnd: 100,
          countToEnd: true,
        },
-        _now: timeCore.generateInstanceFromClock(0, 0, 0, 30),
+        clock: 30,
        timer: {
          addedTime: 0,
          duration: 100,
@@ -421,7 +420,7 @@ describe('getCurrent()', () => {
          pausedAt: null,
          hasFinished: false,
        },
-      } as InternalRuntimeState;
+      } as RuntimeState;

      const current = getCurrent(state);
      expect(current).toBe(70);
@@ -433,11 +432,11 @@ describe('getCurrent()', () => {
          timeEnd: 100,
          countToEnd: true,
        },
-        _now: timeCore.generateInstanceFromClock(0, 0, 0, 30),
+        clock: 30,
        timer: {
          addedTime: 0,
          duration: 100,
-          startedAt: timeCore.generateInstanceFromClock(0, 0, 0, 10),
+          startedAt: 10,
        },
        rundown: {
          plannedEnd: 100,
@@ -446,7 +445,7 @@ describe('getCurrent()', () => {
          pausedAt: null,
          hasFinished: false,
        },
-      } as InternalRuntimeState;
+      } as RuntimeState;

      const current = getCurrent(state);
      expect(current).toBe(70);
@@ -458,11 +457,11 @@ describe('getCurrent()', () => {
          timeEnd: 100,
          countToEnd: true,
        },
-        _now: timeCore.generateInstanceFromClock(0, 0, 0, 30),
+        clock: 30,
        timer: {
          addedTime: 7,
          duration: 100,
-          startedAt: timeCore.generateInstanceFromClock(0, 0, 0, 10),
+          startedAt: 10,
        },
        rundown: {
          plannedEnd: 100,
@@ -471,7 +470,7 @@ describe('getCurrent()', () => {
          pausedAt: null,
          hasFinished: false,
        },
-      } as InternalRuntimeState;
+      } as RuntimeState;

      const current = getCurrent(state);
      expect(current).toBe(77);
@@ -484,11 +483,11 @@ describe('getCurrent()', () => {
          timeEnd: 600000, // 00:10:00
          countToEnd: true,
        },
-        _now: timeCore.generateInstanceFromClock(22, 5, 0),
+        clock: 79500000, // 22:05:00
        timer: {
          addedTime: 0,
          duration: Infinity, // not relevant,
-          startedAt: timeCore.generateInstanceFromClock(22, 0, 0),
+          startedAt: 79200000, // 22:00:00
        },
        rundown: {
          actualStart: 79200000,
@@ -498,7 +497,7 @@ describe('getCurrent()', () => {
          pausedAt: null,
          hasFinished: false,
        },
-      } as InternalRuntimeState;
+      } as RuntimeState;

      const current = getCurrent(state);
      expect(current).toBe(dayInMs - 79500000 + 600000);
@@ -506,7 +505,7 @@ describe('getCurrent()', () => {

    it('handles events that were started late', () => {
      const state = {
-        _now: timeCore.generateInstanceFromClock(22, 46, 40), // 22:46:40 <--- starting 16 min after the scheduled end
+        clock: 82000000, // 22:46:40 <--- starting 16 min after the scheduled end
        eventNow: {
          timeStart: 77400000, // 21:30:00
          timeEnd: 81000000, // 22:30:00
@@ -516,7 +515,7 @@ describe('getCurrent()', () => {
        timer: {
          addedTime: 0,
          duration: Infinity, // not relevant,
-          startedAt: timeCore.generateInstanceFromClock(22, 0, 0),
+          startedAt: 79200000, // 22:00:00
        },
        rundown: {
          actualStart: 82000000, // 22:46:40 <--- started now
@@ -526,7 +525,7 @@ describe('getCurrent()', () => {
          pausedAt: null,
          hasFinished: false,
        },
-      } as InternalRuntimeState;
+      } as RuntimeState;

      const current = getCurrent(state);
      expect(current).toBe(81000000 - 82000000); // <-- planned end - now
@@ -542,17 +541,17 @@ describe('getExpectedFinish() and getCurrentTime() combined', () => {
        timeEnd: 10,
        timerType: TimerType.CountDown,
      },
-      _now: timeCore.generateInstanceFromClock(0, 0, 0),
+      clock: 0,
      timer: {
        addedTime: 0,
        duration,
-        startedAt: timeCore.generateInstanceFromClock(0, 0, 0),
+        startedAt: 0,
      },
      _timer: {
        pausedAt: null,
        hasFinished: false,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const expectedFinish = getExpectedFinish(state);
    const current = getCurrent(state);
@@ -570,25 +569,25 @@ describe('getExpectedFinish() and getCurrentTime() combined', () => {
        timeEnd: 10,
        timerType: TimerType.CountDown,
      },
-      _now: timeCore.generateInstanceFromClock(0, 0, 0, 5),
+      clock: 5,
      timer: {
        addedTime: 3,
        duration,
-        startedAt: timeCore.generateInstanceFromClock(0, 0, 0),
+        startedAt: 0,
      },
      _timer: {
        pausedAt: null,
        hasFinished: false,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const expectedFinish = getExpectedFinish(state);
    const current = getCurrent(state);

    const elapsed = duration - current;
    expect(expectedFinish).toBe(13);
-    expect(current).toBe(8);
    expect(elapsed).toBe(2);
+    expect(current).toBe(8);
  });
 });

@@ -872,7 +871,7 @@ describe('getRuntimeOffset()', () => {
        dayOffset: 0,
      },
      timer: {
-        startedAt: timeCore.generateInstanceFromClock(0, 0, 0, 150),
+        startedAt: 150,
        addedTime: 0,
        current: 0,
      },
@@ -884,9 +883,9 @@ describe('getRuntimeOffset()', () => {
        plannedStart: 100,
        currentDay: 0,
      },
-      _now: timeCore.generateInstanceFromClock(0, 0, 0, 150),
+      clock: 150,
      _startDayOffset: 0,
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const { absolute } = getRuntimeOffset(state);
    expect(absolute).toBe(50);
@@ -900,7 +899,7 @@ describe('getRuntimeOffset()', () => {
        dayOffset: 0,
      },
      timer: {
-        startedAt: timeCore.generateInstanceFromClock(0, 0, 0, 150), // we started 50ms delayed
+        startedAt: 150, // we started 50ms delayed
        addedTime: 10, // we compensated with 10ms
        current: 10, // we are 10ms into the timer
      },
@@ -913,7 +912,7 @@ describe('getRuntimeOffset()', () => {
        currentDay: 0,
      },
      _startDayOffset: 0,
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const { absolute } = getRuntimeOffset(state);
    expect(absolute).toBe(60);
@@ -928,7 +927,7 @@ describe('getRuntimeOffset()', () => {
        dayOffset: 0,
      },
      timer: {
-        startedAt: timeCore.generateInstanceFromClock(0, 0, 0, 100), // we started ontime
+        startedAt: 100, // we started ontime
        current: -10, // we are 10 seconds over
        addedTime: 0, // we have not compensated with added time
      },
@@ -941,7 +940,7 @@ describe('getRuntimeOffset()', () => {
        currentDay: 0,
      },
      _startDayOffset: 0,
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const { absolute } = getRuntimeOffset(state);
    expect(absolute).toBe(10);
@@ -955,9 +954,9 @@ describe('getRuntimeOffset()', () => {
        timeEnd: 150,
        dayOffset: 0,
      },
-      _now: timeCore.generateInstanceFromClock(0, 0, 0, 150),
+      clock: 150,
      timer: {
-        startedAt: timeCore.generateInstanceFromClock(0, 0, 0, 100), // started on time
+        startedAt: 100, // started on time
        current: 25, // are 25ms into it
        addedTime: 0,
      },
@@ -970,7 +969,7 @@ describe('getRuntimeOffset()', () => {
        currentDay: 0,
      },
      _startDayOffset: 0,
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const { absolute } = getRuntimeOffset(state);
    expect(absolute).toBe(25);
@@ -978,7 +977,7 @@ describe('getRuntimeOffset()', () => {

  it('offset doesnt exist if we havent started', () => {
    const state = {
-      _now: timeCore.generateInstanceFromClock(22, 48, 0), // 78480789
+      clock: 78480789,
      eventNow: {
        id: 'd6a2ce',
        timeStart: 77400000,
@@ -1012,7 +1011,7 @@ describe('getRuntimeOffset()', () => {
      },
      _startDayOffset: 0,
      _timer: { pausedAt: null },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const { absolute } = getRuntimeOffset(state);
    expect(absolute).toBe(0);
@@ -1020,7 +1019,7 @@ describe('getRuntimeOffset()', () => {

  it('with time-to-end, offsets dont exist if we are not in overtime', () => {
    const state = {
-      _now: timeCore.generateInstanceFromClock(22, 13, 20),
+      clock: 80000000, // 22:13:20
      eventNow: {
        id: 'd6a2ce',
        type: 'event',
@@ -1064,11 +1063,11 @@ describe('getRuntimeOffset()', () => {
        expectedFinish: 81600000,
        playback: Playback.Play,
        secondaryTimer: null,
-        startedAt: timeCore.generateInstanceFromClock(21, 40, 0),
+        startedAt: 78000000,
      },
      _startDayOffset: 0,
      _timer: { pausedAt: null },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const { absolute } = getRuntimeOffset(state);
    expect(absolute).toBe(0);
@@ -1076,7 +1075,7 @@ describe('getRuntimeOffset()', () => {

  it('with time-to-end, offset is the overtime', () => {
    const state = {
-      _now: timeCore.generateInstanceFromClock(22, 46, 40),
+      clock: 82000000, // 22:46:40
      eventNow: {
        id: 'd6a2ce',
        type: 'event',
@@ -1120,11 +1119,11 @@ describe('getRuntimeOffset()', () => {
        expectedFinish: 81600000,
        playback: Playback.Play,
        secondaryTimer: null,
-        startedAt: timeCore.generateInstanceFromClock(21, 40, 0),
+        startedAt: 78000000,
      },
      _startDayOffset: 0,
      _timer: { pausedAt: null },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const { absolute } = getRuntimeOffset(state);
    expect(absolute).toBe(400000 - 200000); // <--- offset is always the overtime + added time
@@ -1132,7 +1131,7 @@ describe('getRuntimeOffset()', () => {

  it('handles time-to-end started after the end time', () => {
    const state = {
-      _now: timeCore.generateInstanceFromClock(22, 46, 40), // 22:46:40 <--- starting 16m 40s after the scheduled end
+      clock: 82000000, // 22:46:40 <--- starting 16m 40s after the scheduled end
      eventNow: {
        id: 'd6a2ce',
        timeStart: 77400000, // 21:30:00
@@ -1165,14 +1164,14 @@ describe('getRuntimeOffset()', () => {
        expectedFinish: 82000000 + 3600000, // <--- now + duration
        playback: Playback.Play,
        secondaryTimer: null,
-        startedAt: timeCore.generateInstanceFromClock(22, 46, 40),
+        startedAt: 82000000, // <--- started now
      },
      _startDayOffset: 0,
      _timer: { pausedAt: null },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const updateCurrent = getCurrent(state);
-    state.timer.current = updateCurrent as Duration;
+    state.timer.current = updateCurrent;
    const { absolute } = getRuntimeOffset(state);
    expect(millisToString(absolute)).toBe('00:16:40');
    expect(absolute).toBe(82000000 - 81000000); // <-- now - planned end
@@ -1188,7 +1187,7 @@ describe('getRuntimeOffset() relative', () => {
        dayOffset: 0,
      },
      timer: {
-        startedAt: timeCore.generateInstanceFromClock(0, 0, 0, 150),
+        startedAt: 150,
        addedTime: 0,
        current: 0,
      },
@@ -1201,7 +1200,7 @@ describe('getRuntimeOffset() relative', () => {
        currentDay: 0,
      },
      _startDayOffset: 0,
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const { absolute, relative } = getRuntimeOffset(state);
    expect(absolute).toBe(0);
@@ -1215,7 +1214,7 @@ describe('getRuntimeOffset() relative', () => {
        dayOffset: 0,
      },
      timer: {
-        startedAt: timeCore.generateInstanceFromClock(0, 0, 0, 150),
+        startedAt: 150,
        addedTime: 0,
        current: 0,
      },
@@ -1228,7 +1227,7 @@ describe('getRuntimeOffset() relative', () => {
        currentDay: 0,
      },
      _startDayOffset: 0,
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const { absolute, relative } = getRuntimeOffset(state);
    expect(absolute).toBe(50);
@@ -1242,7 +1241,7 @@ describe('getRuntimeOffset() relative', () => {
        dayOffset: 0,
      },
      timer: {
-        startedAt: timeCore.generateInstanceFromClock(0, 0, 0, 100),
+        startedAt: 100,
        addedTime: 0,
        current: 0,
      },
@@ -1255,7 +1254,7 @@ describe('getRuntimeOffset() relative', () => {
        currentDay: 0,
      },
      _startDayOffset: 0,
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const { absolute, relative } = getRuntimeOffset(state);
    expect(absolute).toBe(-50);
@@ -1277,7 +1276,7 @@ describe('getTimerPhase()', () => {
        secondaryTimer: null,
        startedAt: null,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const phase = getTimerPhase(state);
    expect(phase).toBe(TimerPhase.None);
@@ -1295,7 +1294,7 @@ describe('getTimerPhase()', () => {
        timeDanger: 100,
        timeWarning: 200,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const phase = getTimerPhase(state);
    expect(phase).toBe(TimerPhase.Overtime);
@@ -1313,7 +1312,7 @@ describe('getTimerPhase()', () => {
        timeDanger: 100,
        timeWarning: 200,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const phase = getTimerPhase(state);
    expect(phase).toBe(TimerPhase.Danger);
@@ -1331,7 +1330,7 @@ describe('getTimerPhase()', () => {
        timeDanger: 100,
        timeWarning: 200,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const phase = getTimerPhase(state);
    expect(phase).toBe(TimerPhase.Warning);
@@ -1349,7 +1348,7 @@ describe('getTimerPhase()', () => {
        timeDanger: 100,
        timeWarning: 200,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const phase = getTimerPhase(state);
    expect(phase).toBe(TimerPhase.Default);
@@ -1357,7 +1356,7 @@ describe('getTimerPhase()', () => {

  it('#1042 identifies waiting to roll', () => {
    const state = {
-      _now: timeCore.generateInstanceFromClock(16, 28, 11), //55691050
+      clock: 55691050,
      eventNow: null,
      eventNext: null,
      rundown: {
@@ -1383,13 +1382,13 @@ describe('getTimerPhase()', () => {
        startedAt: null,
      },
      _timer: {
-        forceFinish: false,
+        forceFinish: null,
        pausedAt: null,
      },
      _rundown: {
        totalDelay: 0,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const phase = getTimerPhase(state);
    expect(phase).toBe(TimerPhase.Pending);
@@ -1397,7 +1396,7 @@ describe('getTimerPhase()', () => {

  it('#1042 identifies waiting to roll', () => {
    const state = {
-      _now: timeCore.generateInstanceFromClock(16, 28, 11), //55691050
+      clock: 55691050,
      eventNow: null,
      eventNext: null,
      rundown: {
@@ -1423,13 +1422,13 @@ describe('getTimerPhase()', () => {
        startedAt: null,
      },
      _timer: {
-        forceFinish: false,
+        forceFinish: null,
        pausedAt: null,
      },
      _rundown: {
        totalDelay: 0,
      },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const phase = getTimerPhase(state);
    expect(phase).toBe(TimerPhase.Pending);
@@ -5,8 +5,6 @@ import { RundownMetadata } from '../api-data/rundown/rundown.types.js';
 import { getTimedIndexFromPlayableIndex } from '../api-data/rundown/rundown.utils.js';
 import { normaliseEndTime } from './timerUtils.js';

-// import * as timeCore from '../lib/time-core/timeCore.js';
-
 /**
 * Finds current event in a rolling rundown
 */
@@ -760,17 +760,16 @@ function broadcastResult(_target: any, _propertyKey: string, descriptor: Propert

    // save the restore state
    if (hasImmediateChanges) {
-      const internalState = runtimeState.getInternalState();
      restoreService
        .save({
          playback: state.timer.playback,
          selectedEventId: state.eventNow?.id ?? null,
          startedAt: state.timer.startedAt,
          addedTime: state.timer.addedTime,
-          pausedAt: internalState._timer.pausedAt,
-          pausedDuration: internalState._timer.pausedDuration,
+          pausedAt: state._timer.pausedAt,
+          pausedDuration: state._timer.pausedDuration,
          firstStart: state.rundown.actualStart,
-          startEpoch: internalState._startEpoch,
+          startEpoch: state._startEpoch,
          currentDay: state.rundown.currentDay,
        })
        .catch((_e) => {
@@ -1,9 +1,7 @@
-import { Day, Duration, Maybe, TimeOfDay, TimerPhase } from 'ontime-types';
+import { Day, MaybeNumber, TimeOfDay, TimerPhase } from 'ontime-types';
 import { MILLIS_PER_HOUR, checkIsNow, dayInMs, isPlaybackActive } from 'ontime-utils';

-import * as timeCore from '../lib/time-core/timeCore.js';
-import { ZERO_DURATION } from '../lib/time-core/timeCore.js';
-import type { InternalRuntimeState, RuntimeState } from '../stores/runtimeState.js';
+import type { RuntimeState } from '../stores/runtimeState.js';

 /**
 * handle events that span over midnight
@@ -22,46 +20,48 @@ export function hasCrossedMidnight(previous: TimeOfDay, current: TimeOfDay): boo

 /**
 * Calculates expected finish time of a running timer
- * @param {InternalRuntimeState} state runtime state
+ * @param {RuntimeState} state runtime state
 * @returns {number | null} new current time or null if nothing is running
 */
-export function getExpectedFinish(state: InternalRuntimeState): Maybe<TimeOfDay> {
+export function getExpectedFinish(state: RuntimeState): MaybeNumber {
  const { startedAt, duration, addedTime } = state.timer;
+
  if (state.eventNow === null) {
    return null;
  }

  const { countToEnd, timeEnd } = state.eventNow;
  const { pausedAt } = state._timer;
-  const { _now } = state;
+  const { clock } = state;

  if (startedAt === null) {
    return null;
  }

-  const pausedTime = pausedAt !== null ? timeCore.toTimeOfDay(_now) - pausedAt : 0;
+  const pausedTime = pausedAt != null ? clock - pausedAt : 0;
+
  if (countToEnd) {
-    return (timeEnd + addedTime + pausedTime) as TimeOfDay;
+    return timeEnd + addedTime + pausedTime;
  }

  // handle events that finish the day after
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- duration exists if there is a timer
-  const expectedFinish = timeCore.toTimeOfDay(startedAt) + duration! + addedTime + pausedTime;
-
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- duration exists if ther eis a timer
+  const expectedFinish = startedAt + duration! + addedTime + pausedTime;
  if (expectedFinish > dayInMs) {
-    return (expectedFinish - dayInMs) as TimeOfDay;
+    return expectedFinish - dayInMs;
  }

  // an event cannot finish before it started (user added too much negative time)
-  return Math.max(expectedFinish, timeCore.toTimeOfDay(startedAt)) as TimeOfDay;
+  return Math.max(expectedFinish, startedAt);
 }

 /**
 * Calculates running countdown
- * @param {InternalRuntimeState} state runtime state
+ * @param {RuntimeState} state runtime state
 * @returns {number} current time for timer
 */
-export function getCurrent(state: InternalRuntimeState): Duration {
+
+export function getCurrent(state: RuntimeState): number {
  // eslint-disable-next-line no-unused-labels -- dev code path
  DEV: {
    if (state.eventNow === null || state.timer.duration === null) {
@@ -71,12 +71,12 @@ export function getCurrent(state: InternalRuntimeState): Duration {
  const { startedAt, duration, addedTime } = state.timer;
  const { countToEnd, timeStart, timeEnd } = state.eventNow;
  const { pausedAt } = state._timer;
-  const { _now } = state;
+  const { clock } = state;

  if (countToEnd) {
    const isEventOverMidnight = timeStart > timeEnd;
    const correctDay = isEventOverMidnight ? dayInMs : 0;
-    return (correctDay - timeCore.toTimeOfDay(_now) + timeEnd + addedTime) as Duration;
+    return correctDay - clock + timeEnd + addedTime;
  }

  if (startedAt === null) {
@@ -84,19 +84,19 @@ export function getCurrent(state: InternalRuntimeState): Duration {
  }

  if (pausedAt != null) {
-    return (timeCore.toTimeOfDay(startedAt) + duration + addedTime - pausedAt) as Duration;
+    return startedAt + duration + addedTime - pausedAt;
  }

-  const hasPassedMidnight = timeCore.toTimeOfDay(startedAt) > timeCore.toTimeOfDay(_now);
+  const hasPassedMidnight = startedAt > clock;
  const correctDay = hasPassedMidnight ? dayInMs : 0;
-  return (timeCore.toTimeOfDay(startedAt) + duration + addedTime - timeCore.toTimeOfDay(_now) - correctDay) as Duration;
+  return startedAt + duration + addedTime - clock - correctDay;
 }

 /**
 * Calculates active time elapsed since the timer started.
 */
-export function getElapsed(state: InternalRuntimeState): Maybe<Duration> {
-  const { _now } = state;
+export function getElapsed(state: RuntimeState): MaybeNumber {
+  const { clock } = state;
  const { startedAt } = state.timer;
  const { pausedAt, pausedDuration } = state._timer;

@@ -104,11 +104,11 @@ export function getElapsed(state: InternalRuntimeState): Maybe<Duration> {
    return null;
  }

-  const referenceClock = pausedAt ?? timeCore.toTimeOfDay(_now);
-  const elapsedSinceStart = getTimeSinceStart(referenceClock, timeCore.toTimeOfDay(startedAt));
+  const referenceClock = pausedAt ?? clock;
+  const elapsedSinceStart = getTimeSinceStart(referenceClock, startedAt);
  const activeElapsed = elapsedSinceStart - pausedDuration;

-  return Math.max(0, activeElapsed) as Duration;
+  return Math.max(0, activeElapsed);
 }

 function getTimeSinceStart(clock: TimeOfDay, startedAt: number): number {
@@ -127,7 +127,7 @@ function getTimeSinceStart(clock: TimeOfDay, startedAt: number): number {
 * @returns {boolean}
 */
 export function skippedOutOfEvent(state: RuntimeState, previousTime: number, skipLimit: number): boolean {
-  // we cant have skipped if we haven't started
+  // we cant have skipped if we havent started
  if (state.timer.expectedFinish === null || state.timer.startedAt === null) {
    return false;
  }
@@ -151,12 +151,12 @@ export function skippedOutOfEvent(state: RuntimeState, previousTime: number, ski
 * Positive offset is over time / behind schedule
 * Negative offset is under time / ahead of schedule
 */
-export function getRuntimeOffset(state: InternalRuntimeState): { absolute: Duration; relative: Duration } {
-  const { eventNow, _now, _startDayOffset } = state;
+export function getRuntimeOffset(state: RuntimeState): { absolute: number; relative: number } {
+  const { eventNow, clock, _startDayOffset } = state;
  const { addedTime, current, startedAt } = state.timer;
  // nothing to calculate if there are no loaded events or if we havent started
  if (eventNow === null || startedAt === null || _startDayOffset === null) {
-    return { absolute: ZERO_DURATION, relative: ZERO_DURATION };
+    return { absolute: 0, relative: 0 };
  }

  const { countToEnd, timeStart, dayOffset } = eventNow;
@@ -171,23 +171,20 @@ export function getRuntimeOffset(state: InternalRuntimeState): { absolute: Durat
  }

  // difference between planned event start and actual event start (will be positive if we started behind)
-  const eventStartOffset =
-    timeCore.toTimeOfDay(startedAt) + _startDayOffset * dayInMs - (timeStart + dayOffset * dayInMs);
+  const eventStartOffset = startedAt + _startDayOffset * dayInMs - (timeStart + dayOffset * dayInMs);

  // how long has the event been running over (is a negative number when in over timer so inverted before adding to offset)
  const overtime = Math.abs(Math.min(current, 0));

  // time the playback was paused, the different from now to when we paused is added to the offset TODO: brakes when crossing midnight
-  const pausedTime = state._timer.pausedAt === null ? 0 : timeCore.toTimeOfDay(_now) - state._timer.pausedAt;
+  const pausedTime = state._timer.pausedAt === null ? 0 : clock - state._timer.pausedAt;

  // absolute offset is difference between schedule and playback time
  // in case of count to end, the absolute offset is overtime and added time
-  const absolute = (
-    countToEnd ? overtime + addedTime : eventStartOffset + overtime + pausedTime + addedTime
-  ) as Duration;
+  const absolute = countToEnd ? overtime + addedTime : eventStartOffset + overtime + pausedTime + addedTime;

  // the relative offset is the same as the absolute but adjusted relative to the actual start time
-  const relative = (absolute + plannedStart - actualStart - _startDayOffset * dayInMs) as Duration;
+  const relative = absolute + plannedStart - actualStart - _startDayOffset * dayInMs;

  return { absolute, relative };
 }
@@ -196,7 +193,7 @@ export function getRuntimeOffset(state: InternalRuntimeState): { absolute: Durat
 * Checks running timer to see which phase it currently is in
 * @param state
 */
-export function getTimerPhase(state: InternalRuntimeState): TimerPhase {
+export function getTimerPhase(state: RuntimeState): TimerPhase {
  if (!isPlaybackActive(state.timer.playback)) {
    return TimerPhase.None;
  }
@@ -226,7 +223,7 @@ export function getTimerPhase(state: InternalRuntimeState): TimerPhase {

 /**
 * Finds the day offset relative to an event start
- * used by the RuntimeState on first start to get correct offsets
+ * used byt the runtimeState on first start to get correct offsets
 */
 export function findDayOffset(plannedStart: number, clock: number): Day {
  const distance = clock - plannedStart;
@@ -1,12 +1,33 @@
-import { Day, type Duration, type Instant, OffsetMode, Playback, TimeOfDay, TimerPhase } from 'ontime-types';
+import { OffsetMode, Playback, type TimeOfDay, TimerPhase } from 'ontime-types';
 import { deepmerge } from 'ontime-utils';

-import { ZERO_DURATION } from '../../lib/time-core/timeCore.js';
-import type { InternalRuntimeState, RuntimeState } from '../runtimeState.js';
+import type { RuntimeState } from '../runtimeState.js';

-export const runtimePlaceholder = {
+const baseState: RuntimeState = {
+  clock: 0 as TimeOfDay,
+  eventNow: null,
+  eventNext: null,
+  eventFlag: null,
+  groupNow: null,
+  rundown: {
+    selectedEventIndex: null,
+    numEvents: 0,
+    plannedStart: 0,
+    plannedEnd: 0,
+    actualStart: null,
+    actualGroupStart: null,
+    currentDay: 0,
+  },
+  offset: {
+    absolute: 0,
+    relative: 0,
+    mode: OffsetMode.Absolute,
+    expectedRundownEnd: null,
+    expectedGroupEnd: null,
+    expectedFlagStart: null,
+  },
  timer: {
-    addedTime: ZERO_DURATION,
+    addedTime: 0,
    current: null,
    duration: null,
    elapsed: null,
@@ -16,43 +37,10 @@ export const runtimePlaceholder = {
    secondaryTimer: null,
    startedAt: null,
  },
-  offset: {
-    absolute: ZERO_DURATION,
-    relative: ZERO_DURATION,
-    mode: OffsetMode.Absolute,
-    expectedGroupEnd: null,
-    expectedRundownEnd: null,
-    expectedFlagStart: null,
-  },
-  rundown: {
-    selectedEventIndex: null,
-    numEvents: 0,
-    plannedStart: 0 as TimeOfDay,
-    plannedEnd: 0 as TimeOfDay,
-    actualStart: null,
-    actualGroupStart: null,
-
-    currentDay: 0 as Day,
-  },
-} as Readonly<InternalRuntimeState>;
-
-const baseState: InternalRuntimeState = {
-  _now: 0 as Instant,
-  eventNow: null,
-  eventNext: null,
-  eventFlag: null,
-  groupNow: null,
-  rundown: {
-    ...runtimePlaceholder.rundown,
-  },
-  offset: {
-    ...runtimePlaceholder.offset,
-  },
-  timer: { ...runtimePlaceholder.timer },
  _timer: {
-    forceFinish: false,
+    forceFinish: null,
    pausedAt: null,
-    pausedDuration: 0 as Duration,
+    pausedDuration: 0,
    secondaryTarget: null,
    hasFinished: false,
  },
@@ -6,10 +6,9 @@ import { rundownCache } from '../../api-data/rundown/rundown.dao.js';
 import { initRundown } from '../../api-data/rundown/rundown.service.js';
 import { RundownMetadata } from '../../api-data/rundown/rundown.types.js';
 import {
-  type InternalRuntimeState,
+  type RuntimeState,
  addTime,
  clearState,
-  getInternalState,
  getState,
  load,
  loadGroupFlagAndEnd,
@@ -33,7 +32,7 @@ const mockEvent = {
 } as PlayableEvent;

 const mockState = {
-  _now: 666,
+  clock: 666,
  eventNow: null,
  eventNext: null,
  rundown: {
@@ -54,7 +53,7 @@ const mockState = {
    pausedAt: null,
    hasFinished: false,
  },
-} as InternalRuntimeState;
+} as RuntimeState;

 vi.mock('../../classes/data-provider/DataProvider.js', () => {
  return {
@@ -109,34 +108,34 @@ describe('mutation on runtimeState', () => {

      const { metadata, rundown } = rundownCache.get();
      load(mockEvent, rundown, metadata);
-      let newState = getInternalState();
+      let newState = getState();
      expect(newState.eventNow?.id).toBe(mockEvent.id);
      expect(newState.eventNext?.id).toBe('event2');
      expect(newState.timer.playback).toBe(Playback.Armed);
-      expect(getState().clock).not.toBe(666);
+      expect(newState.clock).not.toBe(666);
      expect(newState.groupNow).toBeNull();

      // 2. Start event
      vi.setSystemTime('jan 1 00:02');
      let success = start();
-      newState = getInternalState();
+      newState = getState();
      expect(success).toBe(true);
      expect(newState.timer).toMatchObject({
        playback: Playback.Play,
      });
-      expect(newState.rundown.actualStart).toBe(getState().clock);
+      expect(newState.rundown.actualStart).toBe(newState.clock);

      // 3. Pause event
      vi.setSystemTime('jan 1 00:03');
      success = pause();
-      newState = getInternalState();
+      newState = getState();
      expect(success).toBe(true);
-      expect(getState().clock).not.toBe(666);
+      expect(newState.clock).not.toBe(666);
      expect(newState.timer).toMatchObject({
        playback: Playback.Pause,
        addedTime: 0,
      });
-      expect(newState._timer.pausedAt).toEqual(getState().clock);
+      expect(newState._timer.pausedAt).toEqual(newState.clock);

      success = pause();
      expect(success).toBe(false);
@@ -144,7 +143,7 @@ describe('mutation on runtimeState', () => {
      // 4. Restart event
      vi.setSystemTime('jan 1 00:04');
      success = start();
-      newState = getInternalState();
+      newState = getState();
      expect(success).toBe(true);
      expect(newState.timer).toMatchObject({
        playback: Playback.Play,
@@ -164,7 +163,7 @@ describe('mutation on runtimeState', () => {
      // 5. Stop event
      vi.setSystemTime('jan 1 00:05');
      success = stop();
-      newState = getInternalState();
+      newState = getState();
      expect(success).toBe(true);
      expect(newState.eventNow).toBe(null);
      expect(newState.timer).toMatchObject({
@@ -826,7 +825,7 @@ describe('roll mode', () => {
    test('pending event', () => {
      const { rundown, metadata } = rundownCache.get();
      const { eventId, didStart } = roll(rundown, metadata);
-      const state = getInternalState();
+      const state = getState();

      expect(eventId).toBe('1');
      expect(didStart).toBe(false);
@@ -945,7 +944,7 @@ describe('loadGroupFlagAndEnd()', () => {
      groupNow: null,
      eventNow: rundown.entries[11],
      rundown: { actualGroupStart: null },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const metadata = { playableEventOrder: ['0', '11', '3'], flags: ['1'] } as RundownMetadata;

@@ -973,7 +972,7 @@ describe('loadGroupFlagAndEnd()', () => {
      groupNow: rundown.entries[1],
      eventNow: rundown.entries[22],
      rundown: { actualGroupStart: null },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const metadata = { playableEventOrder: ['0', '11', '22'], flags: ['1'] } as RundownMetadata;

@@ -1001,7 +1000,7 @@ describe('loadGroupFlagAndEnd()', () => {
      groupNow: rundown.entries[1],
      eventNow: rundown.entries[0],
      rundown: { actualGroupStart: null },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const metadata = { playableEventOrder: ['0', '11', '22'], flags: ['1'] } as RundownMetadata;

@@ -1026,7 +1025,7 @@ describe('loadGroupFlagAndEnd()', () => {
      groupNow: null,
      eventNow: rundown.entries[0],
      rundown: { actualGroupStart: null },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const metadata = { playableEventOrder: ['0', '1'], flags: ['1'] } as RundownMetadata;

@@ -1088,7 +1087,7 @@ describe('loadGroupFlagAndEnd()', () => {
      groupNow: null,
      eventNow: rundown.entries[0],
      rundown: { actualGroupStart: null },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const metadata = { playableEventOrder: ['0', '1', '2', '3'], flags: ['3'] } as RundownMetadata;

@@ -1170,7 +1169,7 @@ describe('loadGroupFlagAndEnd()', () => {
      groupNow: null,
      eventNow: rundown.entries[0],
      rundown: { actualGroupStart: null },
-    } as InternalRuntimeState;
+    } as RuntimeState;

    const metadata = { playableEventOrder: ['0', '1', '2', '3'], flags: ['3'] } as RundownMetadata;

@@ -17,6 +17,7 @@ import {
  TimerPhase,
  TimerState,
  isOntimeEvent,
+  runtimeStorePlaceholder,
 } from 'ontime-types';
 import {
  calculateDuration,
@@ -43,18 +44,14 @@ import {
  hasCrossedMidnight,
 } from '../services/timerUtils.js';
 import { timerConfig } from '../setup/config.js';
-import { runtimePlaceholder } from './__mocks__/runtimeState.mocks.js';

 type ExpectedMetadata = {
  event: OntimeEvent;
-  accumulatedGap: Duration;
+  accumulatedGap: number;
  isLinkedToLoaded: boolean;
 } | null;

 export type RuntimeState = {
-  /**
-   * @deprecated we want to phase out the 24h clock
-   */
  clock: TimeOfDay;
  groupNow: OntimeGroup | null;
  eventNow: PlayableEvent | null;
@@ -64,72 +61,36 @@ export type RuntimeState = {
  timer: TimerState;
  rundown: RundownState;
  // private properties of the timer calculations
-};
-
-export type InternalRuntimeState = Omit<RuntimeState, 'clock' | 'timer' | 'offset' | 'rundown'> & {
-  timer: {
-    addedTime: Duration;
-    current: Maybe<Duration>;
-    duration: Maybe<Duration>;
-    elapsed: Maybe<Duration>;
-    expectedFinish: Maybe<TimeOfDay>;
-    phase: TimerPhase;
-    playback: Playback;
-    secondaryTimer: Maybe<Duration>;
-    startedAt: Maybe<Instant>;
-  };
-  offset: {
-    absolute: Duration;
-    relative: Duration;
-    mode: OffsetMode;
-    expectedGroupEnd: Maybe<TimeOfDay>;
-    expectedRundownEnd: Maybe<TimeOfDay>;
-    expectedFlagStart: Maybe<TimeOfDay>;
-  };
-  rundown: {
-    selectedEventIndex: Maybe<number>;
-    numEvents: number;
-    plannedStart: Maybe<TimeOfDay>;
-    plannedEnd: Maybe<TimeOfDay>;
-    actualStart: Maybe<TimeOfDay>;
-    currentDay: Maybe<Day>;
-    actualGroupStart: Maybe<TimeOfDay>;
-  };
-  _now: Instant;
  _timer: {
-    forceFinish: boolean; // whether we should declare an event as finished, will contain the finish time
+    forceFinish: Maybe<TimeOfDay>; // whether we should declare an event as finished, will contain the finish time
    pausedAt: Maybe<TimeOfDay>;
-    pausedDuration: Duration;
+    pausedDuration: number;
    secondaryTarget: Maybe<TimeOfDay>;
    hasFinished: boolean;
  };
  _rundown: {
    totalDelay: number; // this value comes from rundown service
  };
-  _startDayOffset: Maybe<Day>;
-  _startEpoch: Maybe<Instant>;
  _group: ExpectedMetadata;
  _flag: ExpectedMetadata;
  _end: ExpectedMetadata;
+  _startEpoch: Maybe<Instant>;
+  _startDayOffset: Maybe<Day>;
 };

-const runtimeState: InternalRuntimeState = {
-  _now: timeCore.now(),
+const runtimeState: RuntimeState = {
+  clock: timeCore.timeOfDayNow(),
  groupNow: null,
  eventNow: null,
  eventNext: null,
  eventFlag: null,
-  offset: { ...runtimePlaceholder.offset },
-  timer: {
-    ...runtimePlaceholder.timer,
-  },
-  rundown: {
-    ...runtimePlaceholder.rundown,
-  },
+  offset: { ...runtimeStorePlaceholder.offset },
+  timer: { ...runtimeStorePlaceholder.timer },
+  rundown: { ...runtimeStorePlaceholder.rundown },
  _timer: {
-    forceFinish: false,
+    forceFinish: null,
    pausedAt: null,
-    pausedDuration: 0 as Duration,
+    pausedDuration: 0,
    secondaryTarget: null,
    hasFinished: false,
  },
@@ -143,32 +104,19 @@ const runtimeState: InternalRuntimeState = {
  _startDayOffset: null,
 };

-export function getInternalState(): Readonly<InternalRuntimeState> {
-  return runtimeState;
-}
-
 export function getState(): Readonly<RuntimeState> {
  // create a shallow copy of the state
  return {
    ...runtimeState,
-    clock: timeCore.toTimeOfDay(runtimeState._now),
    eventNow: runtimeState.eventNow ? { ...runtimeState.eventNow } : null,
    eventNext: runtimeState.eventNext ? { ...runtimeState.eventNext } : null,
    eventFlag: runtimeState.eventFlag ? { ...runtimeState.eventFlag } : null,
    groupNow: runtimeState.groupNow ? { ...runtimeState.groupNow } : null,
    offset: { ...runtimeState.offset },
    rundown: { ...runtimeState.rundown },
-    timer: {
-      addedTime: runtimeState.timer.addedTime,
-      current: runtimeState.timer.current,
-      duration: runtimeState.timer.duration,
-      elapsed: runtimeState.timer.elapsed,
-      expectedFinish: runtimeState.timer.expectedFinish,
-      phase: runtimeState.timer.phase,
-      playback: runtimeState.timer.playback,
-      secondaryTimer: runtimeState.timer.secondaryTimer,
-      startedAt: runtimeState.timer.startedAt ? timeCore.toTimeOfDay(runtimeState.timer.startedAt) : null,
-    },
+    timer: { ...runtimeState.timer },
+    _timer: { ...runtimeState._timer },
+    _rundown: { ...runtimeState._rundown },
  };
 }

@@ -179,18 +127,22 @@ export function clearEventData() {
  runtimeState.eventNow = null;
  runtimeState.eventNext = null;

-  runtimeState.offset = { ...runtimePlaceholder.offset };
+  runtimeState.offset.absolute = 0;
+  runtimeState.offset.relative = 0;
+  runtimeState.offset.expectedFlagStart = null;
+  runtimeState.offset.expectedGroupEnd = null;
+  runtimeState.offset.expectedRundownEnd = null;

  runtimeState.rundown.selectedEventIndex = null;

  runtimeState.timer.playback = Playback.Stop;
-  runtimeState._now = timeCore.now();
-  runtimeState.timer = { ...runtimePlaceholder.timer };
+  runtimeState.clock = timeCore.timeOfDayNow();
+  runtimeState.timer = { ...runtimeStorePlaceholder.timer };

  // when clearing, we maintain the total delay from the rundown
-  runtimeState._timer.forceFinish = false;
+  runtimeState._timer.forceFinish = null;
  runtimeState._timer.pausedAt = null;
-  runtimeState._timer.pausedDuration = 0 as Duration;
+  runtimeState._timer.pausedDuration = 0;
  runtimeState._timer.secondaryTarget = null;
  runtimeState._timer.hasFinished = false;
 }
@@ -208,18 +160,22 @@ export function clearState() {
  runtimeState.rundown.actualStart = null;
  runtimeState.rundown.selectedEventIndex = null;

-  runtimeState.offset = { ...runtimePlaceholder.offset };
+  runtimeState.offset.absolute = 0;
+  runtimeState.offset.relative = 0;
+  runtimeState.offset.expectedRundownEnd = null;
+  runtimeState.offset.expectedGroupEnd = null;
+  runtimeState.offset.expectedFlagStart = null;

  runtimeState._end = null;

  runtimeState.timer.playback = Playback.Stop;
-  runtimeState._now = timeCore.now();
-  runtimeState.timer = { ...runtimePlaceholder.timer };
+  runtimeState.clock = timeCore.timeOfDayNow();
+  runtimeState.timer = { ...runtimeStorePlaceholder.timer };

  // when clearing, we maintain the total delay from the rundown
-  runtimeState._timer.forceFinish = false;
+  runtimeState._timer.forceFinish = null;
  runtimeState._timer.pausedAt = null;
-  runtimeState._timer.pausedDuration = 0 as Duration;
+  runtimeState._timer.pausedDuration = 0;
  runtimeState._timer.secondaryTarget = null;
  runtimeState._timer.hasFinished = false;

@@ -261,9 +217,9 @@ export function updateRundownData(rundownData: {
  runtimeState._rundown.totalDelay = rundownData.totalDelay;

  runtimeState.rundown.numEvents = rundownData.numEvents;
-  runtimeState.rundown.plannedStart = rundownData.firstStart as TimeOfDay;
+  runtimeState.rundown.plannedStart = rundownData.firstStart;
  runtimeState.rundown.plannedEnd =
-    rundownData.firstStart === null ? null : ((rundownData.firstStart + rundownData.totalDuration) as TimeOfDay);
+    rundownData.firstStart === null ? null : rundownData.firstStart + rundownData.totalDuration;

  if (isPlaybackActive(runtimeState.timer.playback)) getExpectedTimes();
 }
@@ -297,7 +253,7 @@ export function load(

  // update state
  runtimeState.timer.playback = Playback.Armed;
-  runtimeState.timer.duration = event.duration as Duration;
+  runtimeState.timer.duration = calculateDuration(event.timeStart, event.timeEnd);
  runtimeState.timer.current = getCurrent(runtimeState);
  runtimeState.rundown.numEvents = metadata.timedEventOrder.length;

@@ -311,13 +267,13 @@ export function load(
      (firstStart === null || typeof firstStart === 'number') &&
      (startEpoch === null || typeof startEpoch === 'number')
    ) {
-      runtimeState.rundown.actualStart = firstStart as TimeOfDay;
+      runtimeState.rundown.actualStart = firstStart;
      runtimeState._startEpoch = startEpoch;
      if (firstStart !== null && runtimeState.rundown.plannedStart !== null) {
        runtimeState._startDayOffset = findDayOffset(runtimeState.rundown.plannedStart, firstStart);
      }
      if (currentDay !== undefined) {
-        runtimeState.rundown.currentDay = currentDay as Day;
+        runtimeState.rundown.currentDay = currentDay;
      }
      const { absolute, relative } = getRuntimeOffset(runtimeState);
      runtimeState.offset.absolute = absolute;
@@ -409,16 +365,16 @@ export function updateLoaded(event?: PlayableEvent): string | undefined {

    // handle edge cases with roll
    if (runtimeState.timer.playback === Playback.Roll) {
-      const offsetClock = timeCore.toTimeOfDay(runtimeState._now) - runtimeState.offset.absolute;
+      const offsetClock = runtimeState.clock - runtimeState.offset.absolute;
      // if waiting to roll, we update the targets and potentially start the timer
      if (runtimeState._timer.secondaryTarget !== null) {
        if (runtimeState.eventNow.timeStart < offsetClock && offsetClock < runtimeState.eventNow.timeEnd) {
          // if the event is now, we queue a start
          runtimeState._timer.secondaryTarget = runtimeState.eventNow.timeStart as TimeOfDay;
-          runtimeState.timer.secondaryTimer = (runtimeState._timer.secondaryTarget - offsetClock) as Duration;
+          runtimeState.timer.secondaryTimer = runtimeState._timer.secondaryTarget - offsetClock;
        } else {
          runtimeState._timer.secondaryTarget = normaliseRollStart(
-            runtimeState.eventNow.timeStart as TimeOfDay,
+            runtimeState.eventNow.timeStart,
            offsetClock,
          ) as TimeOfDay;
        }
@@ -435,7 +391,7 @@ export function updateLoaded(event?: PlayableEvent): string | undefined {

  runtimeState.timer.startedAt = null;
  runtimeState._timer.hasFinished = false;
-  runtimeState.timer.addedTime = 0 as Duration;
+  runtimeState.timer.addedTime = 0;
  runtimeState._timer.pausedAt = null;

  // this could be looked after by the timer
@@ -458,7 +414,7 @@ export function updateAll(rundown: Rundown, metadata: RundownMetadata) {
  loadGroupFlagAndEnd(rundown, metadata, eventNowIndex);
 }

-export function start(state: InternalRuntimeState = runtimeState): boolean {
+export function start(state: RuntimeState = runtimeState): boolean {
  if (state.eventNow === null) {
    return false;
  }
@@ -466,19 +422,22 @@ export function start(state: InternalRuntimeState = runtimeState): boolean {
    return false;
  }

-  state._now = timeCore.now();
+  const epoch = timeCore.now();
+  const now = timeCore.toTimeOfDay(epoch);
+
+  state.clock = now;
  state.timer.secondaryTimer = null;

  // add paused time if it exists
  if (state._timer.pausedAt) {
-    const timeToAdd = (timeCore.toTimeOfDay(state._now) - state._timer.pausedAt) as Duration;
-    state.timer.addedTime = timeCore.combineValues(state.timer.addedTime, timeToAdd);
-    state._timer.pausedDuration = timeCore.combineValues(state._timer.pausedDuration, timeToAdd);
+    const timeToAdd = state.clock - state._timer.pausedAt;
+    state.timer.addedTime += timeToAdd;
+    state._timer.pausedDuration += timeToAdd;
    state._timer.pausedAt = null;
  }

  if (state.timer.startedAt === null) {
-    state.timer.startedAt = state._now;
+    state.timer.startedAt = state.clock;
  }

  state.timer.playback = Playback.Play;
@@ -486,15 +445,14 @@ export function start(state: InternalRuntimeState = runtimeState): boolean {
  state.timer.elapsed = getElapsed(state);

  if (state.rundown.actualStart === null) {
-    state._startDayOffset = (findDayOffset(state.eventNow.timeStart, timeCore.toTimeOfDay(state._now)) +
-      state.eventNow.dayOffset) as Day;
+    state._startDayOffset = (findDayOffset(state.eventNow.timeStart, state.clock) + state.eventNow.dayOffset) as Day;
    state.rundown.currentDay = state._startDayOffset;
-    state._startEpoch = state._now;
-    state.rundown.actualStart = timeCore.toTimeOfDay(state._now);
+    state._startEpoch = epoch;
+    state.rundown.actualStart = state.clock;
  }

  if (state.groupNow !== null && state.rundown.actualGroupStart === null) {
-    state.rundown.actualGroupStart = timeCore.toTimeOfDay(state._now);
+    state.rundown.actualGroupStart = state.clock;
  }

  // update timer phase
@@ -517,18 +475,18 @@ export function start(state: InternalRuntimeState = runtimeState): boolean {
  return true;
 }

-export function pause(state: InternalRuntimeState = runtimeState): boolean {
+export function pause(state: RuntimeState = runtimeState): boolean {
  if (state.timer.playback !== Playback.Play) {
    return false;
  }

  state.timer.playback = Playback.Pause;
-  state._now = timeCore.now();
-  state._timer.pausedAt = timeCore.toTimeOfDay(state._now);
+  state.clock = timeCore.timeOfDayNow();
+  state._timer.pausedAt = state.clock;
  return true;
 }

-export function stop(state: InternalRuntimeState = runtimeState): boolean {
+export function stop(state: RuntimeState = runtimeState): boolean {
  if (state.timer.playback === Playback.Stop) {
    return false;
  }
@@ -558,7 +516,7 @@ export function addTime(amount: number) {

  if (willGoNegative && !runtimeState._timer.hasFinished) {
    // set finished time so side effects are triggered
-    runtimeState._timer.forceFinish = true;
+    runtimeState._timer.forceFinish = timeCore.timeOfDayNow();
  } else {
    const willGoPositive = runtimeState.timer.current < 0 && runtimeState.timer.current + amount > 0;
    if (willGoPositive) {
@@ -567,8 +525,8 @@ export function addTime(amount: number) {
  }

  // we can update the state after handling the side effects
-  runtimeState.timer.addedTime = timeCore.combineValues(runtimeState.timer.addedTime, amount as Duration);
-  runtimeState.timer.current = timeCore.combineValues(runtimeState.timer.current, amount as Duration);
+  runtimeState.timer.addedTime += amount;
+  runtimeState.timer.current += amount;
  runtimeState.timer.elapsed = getElapsed(runtimeState);

  // update runtime delays: over - under
@@ -588,8 +546,10 @@ export type UpdateResult = {

 export function update(): UpdateResult {
  // 0. there are some things we always do
-  const previousClock = timeCore.toTimeOfDay(runtimeState._now);
-  runtimeState._now = timeCore.now(); // we update the clock on every update call
+  const previousClock = runtimeState.clock;
+  const epoch = timeCore.now();
+  const now = timeCore.toTimeOfDay(epoch);
+  runtimeState.clock = now; // we update the clock on every update call

  // 1. is playback idle?
  if (!isPlaybackActive(runtimeState.timer.playback)) {
@@ -598,13 +558,13 @@ export function update(): UpdateResult {

  // calculate currentDay from epoch (days elapsed since playback was started)
  if (runtimeState._startEpoch !== null && runtimeState._startDayOffset !== null) {
-    const daysSinceStart = timeCore.daysSinceStart(runtimeState._startEpoch, runtimeState._now);
-    runtimeState.rundown.currentDay = timeCore.combineValues(runtimeState._startDayOffset, daysSinceStart);
+    const daysSinceStart = timeCore.daysSinceStart(runtimeState._startEpoch, epoch);
+    runtimeState.rundown.currentDay = runtimeState._startDayOffset + daysSinceStart;
  }

  // 2. are we waiting to roll?
  if (runtimeState.timer.playback === Playback.Roll && runtimeState.timer.secondaryTimer !== null) {
-    const clockHasCrossedMidnight = hasCrossedMidnight(previousClock, timeCore.toTimeOfDay(runtimeState._now));
+    const clockHasCrossedMidnight = hasCrossedMidnight(previousClock, now);
    return updateIfWaitingToRoll(clockHasCrossedMidnight);
  }

@@ -658,24 +618,22 @@ export function update(): UpdateResult {
    }

    // account for offset
-    const offsetClock = timeCore.toTimeOfDay(
-      timeCore.addDuration(runtimeState._now, runtimeState.offset.absolute as Duration),
-    );
+    const offsetClock = runtimeState.clock + runtimeState.offset.absolute;
    runtimeState.timer.phase = TimerPhase.Pending;

    if (hasCrossedMidnight) {
      // if we crossed midnight, we need to update the target
      // this is the same logic from the roll function
      runtimeState._timer.secondaryTarget = normaliseRollStart(
-        runtimeState.eventNow.timeStart as TimeOfDay,
+        runtimeState.eventNow.timeStart,
        offsetClock,
      ) as TimeOfDay;
    }

-    runtimeState.timer.secondaryTimer = (runtimeState._timer.secondaryTarget! - offsetClock) as Duration;
+    runtimeState.timer.secondaryTimer = runtimeState._timer.secondaryTarget! - offsetClock;
    return {
      hasTimerFinished: false,
-      hasSecondaryTimerFinished: runtimeState.timer.secondaryTimer! <= 0,
+      hasSecondaryTimerFinished: runtimeState.timer.secondaryTimer <= 0,
    };
  }
 }
@@ -692,7 +650,9 @@ export function roll(
  }

  // we will need to do some calculations, update the time first
-  runtimeState._now = timeCore.now();
+  const epoch = timeCore.now();
+  const now = timeCore.toTimeOfDay(epoch);
+  runtimeState.clock = now;

  // 2. if there is an event armed, we use it
  if (runtimeState.timer.playback === Playback.Armed || runtimeState.timer.phase === TimerPhase.Pending) {
@@ -704,9 +664,7 @@ export function roll(
    }

    if (offset) {
-      runtimeState.offset = {
-        ...offset,
-      } as InternalRuntimeState['offset'];
+      runtimeState.offset = { ...offset };
    }
    runtimeState.timer.playback = Playback.Roll;

@@ -715,16 +673,15 @@ export function roll(
      runtimeState.eventNow.timeEnd < runtimeState.eventNow.timeStart
        ? runtimeState.eventNow.timeEnd + dayInMs
        : runtimeState.eventNow.timeEnd;
-    runtimeState.timer.expectedFinish = normalisedEndTime as TimeOfDay;
+    runtimeState.timer.expectedFinish = normalisedEndTime;

    // account for offset
-    // const offsetClock = timeCore.addDuration(runtimeState._now, -runtimeState.offset.absolute as Duration);
-    const offsetClock = timeCore.toTimeOfDay(runtimeState._now) - runtimeState.offset.absolute;
+    const offsetClock = runtimeState.clock - runtimeState.offset.absolute;

    // state catch up
    runtimeState.timer.duration = calculateDuration(runtimeState.eventNow.timeStart, normalisedEndTime);
    runtimeState.timer.current = runtimeState.timer.duration;
-    runtimeState.timer.elapsed = 0 as Duration;
+    runtimeState.timer.elapsed = 0;

    // check if the event is ready to start or if needs to be pending
    const isNow = checkIsNow(runtimeState.eventNow.timeStart, runtimeState.eventNow.timeEnd, offsetClock);
@@ -733,8 +690,8 @@ export function roll(
       * If we are starting an event in roll mode
       * we backtrace all the start times to the supposed start time of the event
       */
-      const plannedStart = runtimeState.eventNow.timeStart as TimeOfDay;
-      runtimeState.timer.startedAt = timeCore.toInstant(plannedStart, runtimeState._now);
+      const plannedStart = runtimeState.eventNow.timeStart;
+      runtimeState.timer.startedAt = plannedStart;
      // reset the secondary timer to cancel any countdowns
      runtimeState.timer.secondaryTimer = null;

@@ -752,20 +709,18 @@ export function roll(
        runtimeState._startDayOffset = (findDayOffset(runtimeState.eventNow.timeStart, plannedStart) +
          runtimeState.eventNow.dayOffset) as Day;
        // backdate _startEpoch to when the event conceptually started
-        const timeElapsed = timeCore.elapsedTime(timeCore.toTimeOfDay(runtimeState._now), plannedStart as TimeOfDay);
-        runtimeState._startEpoch = timeCore.addDuration(runtimeState._now, -timeElapsed as Duration);
+        const timeElapsed = timeCore.elapsedTime(runtimeState.clock, plannedStart as TimeOfDay);
+        runtimeState._startEpoch = timeCore.addDuration(epoch, -timeElapsed as Duration);
        // calculate currentDay from the backdated epoch
-        runtimeState.rundown.currentDay = timeCore.combineValues(
-          runtimeState._startDayOffset,
-          timeCore.daysSinceStart(runtimeState._startEpoch, runtimeState._now),
-        );
+        runtimeState.rundown.currentDay =
+          runtimeState._startDayOffset + timeCore.daysSinceStart(runtimeState._startEpoch, epoch);
      }
    } else {
      runtimeState._timer.secondaryTarget = normaliseRollStart(
-        runtimeState.eventNow.timeStart as TimeOfDay,
+        runtimeState.eventNow.timeStart,
        offsetClock,
      ) as TimeOfDay;
-      runtimeState.timer.secondaryTimer = (runtimeState._timer.secondaryTarget - offsetClock) as Duration;
+      runtimeState.timer.secondaryTimer = runtimeState._timer.secondaryTarget - offsetClock;
      runtimeState.timer.phase = TimerPhase.Pending;
    }

@@ -782,9 +737,9 @@ export function roll(

  // account for offset but we only keep it if passed to us
  if (offset) {
-    runtimeState.offset = { ...offset } as InternalRuntimeState['offset'];
+    runtimeState.offset = { ...offset };
  }
-  const offsetClock = timeCore.toTimeOfDay(runtimeState._now) - runtimeState.offset.absolute;
+  const offsetClock = runtimeState.clock - runtimeState.offset.absolute;

  const { index, isPending } = loadRoll(rundown, metadata, offsetClock);

@@ -811,7 +766,7 @@ export function roll(
    runtimeState.timer.phase = TimerPhase.Pending;
    // we need to normalise start time in case it is the day after
    runtimeState._timer.secondaryTarget = normaliseRollStart(runtimeState.eventNow.timeStart, offsetClock) as TimeOfDay;
-    runtimeState.timer.secondaryTimer = (runtimeState._timer.secondaryTarget - offsetClock) as Duration;
+    runtimeState.timer.secondaryTimer = runtimeState._timer.secondaryTarget - offsetClock;

    // preload timer properties
    runtimeState.timer.duration = calculateDuration(runtimeState.eventNow.timeStart, runtimeState.eventNow.timeEnd);
@@ -834,18 +789,18 @@ export function roll(
   * when we start in roll mode
   * we need to backtrace all times to the supposed start time of the event
   */
-  const plannedStart = runtimeState.eventNow.timeStart as TimeOfDay;
+  const plannedStart = runtimeState.eventNow.timeStart;
  const endTime =
    runtimeState.eventNow.timeEnd < runtimeState.eventNow.timeStart
      ? runtimeState.eventNow.timeEnd + dayInMs
      : runtimeState.eventNow.timeEnd;
-  runtimeState.timer.startedAt = timeCore.toInstant(plannedStart, runtimeState._now);
-  runtimeState.timer.expectedFinish = endTime as TimeOfDay;
+  runtimeState.timer.startedAt = plannedStart;
+  runtimeState.timer.expectedFinish = endTime;

  // state catch up
  runtimeState.timer.duration = calculateDuration(runtimeState.eventNow.timeStart, endTime);
  runtimeState.timer.current = getCurrent(runtimeState);
-  runtimeState.timer.elapsed = 0 as Duration;
+  runtimeState.timer.elapsed = 0;

  // update runtime
  runtimeState.rundown.actualStart = plannedStart;
@@ -858,11 +813,11 @@ export function roll(
  runtimeState._startDayOffset = (findDayOffset(runtimeState.eventNow.timeStart, plannedStart) +
    runtimeState.eventNow.dayOffset) as Day;
  // backdate _startEpoch to when the event conceptually started
-  const timeElapsed = timeCore.elapsedTime(timeCore.toTimeOfDay(runtimeState._now), plannedStart as TimeOfDay);
-  runtimeState._startEpoch = timeCore.addDuration(runtimeState._now, -timeElapsed as Duration);
+  const timeElapsed = timeCore.elapsedTime(runtimeState.clock, plannedStart as TimeOfDay);
+  runtimeState._startEpoch = timeCore.addDuration(epoch, -timeElapsed as Duration);
  // calculate currentDay from the backdated epoch
  runtimeState.rundown.currentDay = (runtimeState._startDayOffset +
-    timeCore.daysSinceStart(runtimeState._startEpoch, runtimeState._now)) as Day;
+    timeCore.daysSinceStart(runtimeState._startEpoch, epoch)) as Day;

  return { eventId: runtimeState.eventNow.id, didStart: true };
 }
@@ -897,11 +852,7 @@ function getExpectedTimes(state = runtimeState) {
        plannedStart,
        actualStart,
      });
-      state.offset.expectedGroupEnd = getExpectedEnd(
-        lastEvent,
-        lastEventExpectedStart,
-        state.rundown.currentDay!,
-      ) as TimeOfDay;
+      state.offset.expectedGroupEnd = getExpectedEnd(lastEvent, lastEventExpectedStart, state.rundown.currentDay!);
    }
  }

@@ -918,7 +869,7 @@ function getExpectedTimes(state = runtimeState) {
        plannedStart,
        actualStart,
      });
-      state.offset.expectedFlagStart = expectedStart as TimeOfDay;
+      state.offset.expectedFlagStart = expectedStart;
    }
  }

@@ -933,7 +884,7 @@ function getExpectedTimes(state = runtimeState) {
      plannedStart,
      actualStart,
    });
-    state.offset.expectedRundownEnd = getExpectedEnd(event, expectedStart, state.rundown.currentDay!) as TimeOfDay;
+    state.offset.expectedRundownEnd = getExpectedEnd(event, expectedStart, state.rundown.currentDay!);
  }
 }

@@ -1006,13 +957,13 @@ export function loadGroupFlagAndEnd(
        if (!foundFlag && metadata.flags.includes(entry.id)) {
          foundFlag = true;
          state.eventFlag = entry as PlayableEvent; // we know it is playable as it is coming from the playableEventOrder list
-          state._flag = { event: entry, isLinkedToLoaded, accumulatedGap: accumulatedGap as Duration };
+          state._flag = { event: entry, isLinkedToLoaded, accumulatedGap };
        }
      }

      if (!foundGroupEnd && entry.id === lastEventInGroup?.id) {
        foundGroupEnd = true;
-        state._group = { event: lastEventInGroup, isLinkedToLoaded, accumulatedGap: accumulatedGap as Duration };
+        state._group = { event: lastEventInGroup, isLinkedToLoaded, accumulatedGap };
      }
    }
  }
@@ -1020,7 +971,7 @@ export function loadGroupFlagAndEnd(
  const lastID = playableEventOrder.at(-1);
  const lastEvent = lastID ? (entries[lastID] as OntimeEvent) : null;
  if (lastEvent) {
-    state._end = { event: lastEvent, isLinkedToLoaded, accumulatedGap: accumulatedGap as Duration };
+    state._end = { event: lastEvent, isLinkedToLoaded, accumulatedGap };
  }
 }

@@ -1,4 +1,4 @@
-import type { Duration, OntimeEvent } from 'ontime-types';
+import type { OntimeEvent } from 'ontime-types';
 import { TimeStrategy } from 'ontime-types';

 import { dayInMs } from '../date-utils/conversionUtils.js';
@@ -103,17 +103,16 @@ export function validateTimes(

 /**
 * @description calculates event duration considering midnight
- * @deprecated - duration is the more useful value from the event data, prefer using that directly
 * @param {number} timeStart
 * @param {number} timeEnd
 * @returns {number}
 */
-export function calculateDuration(timeStart: number, timeEnd: number): Duration {
+export function calculateDuration(timeStart: number, timeEnd: number): number {
  // Durations must be positive
  if (timeEnd < timeStart) {
-    return (timeEnd + dayInMs - timeStart) as Duration;
+    return timeEnd + dayInMs - timeStart;
  }
-  return (timeEnd - timeStart) as Duration;
+  return timeEnd - timeStart;
 }

 export function calculateEnd(timeStart: number, duration: number): number {