From 690db2527751ec9cfa79359535dd81db5604318f Mon Sep 17 00:00:00 2001
From: Aleksei Vesnin <aleksei@vesnin.me>
Date: Thu, 24 Sep 2026 22:23:21 +0300
Subject: [PATCH 1/9] Pin SPEC_REF at the specification's branch and re-vendor
 schema, fixtures and docs from it

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 SPEC_REF                                      |    2 +-
 docs/converting.md                            |   41 +-
 docs/fit-mapping.md                           |   38 +-
 docs/ssrf-mapping.md                          |   71 +-
 docs/suunto-json-mapping.md                   |   49 +-
 docs/suunto-xml-mapping.md                    |   48 +-
 docs/uddf-mapping.md                          |   66 +-
 docs/uddf-writing.md                          |   50 +-
 fixtures/README.md                            |   24 +-
 .../invalid/agency-other-missing.divejson     |   82 +-
 .../invalid/avg-depth-exceeds-max.divejson    |   82 +-
 fixtures/invalid/bad-version.divejson         |   82 +-
 fixtures/invalid/bbox-missing-corner.divejson |   82 +-
 .../invalid/bbox-south-exceeds-north.divejson |   82 +-
 .../invalid/bbox-without-position.divejson    |   82 +-
 .../invalid/channel-length-mismatch.divejson  |   82 +-
 ...ourse-agency-other-without-agency.divejson |  200 +-
 .../invalid/course-dates-reversed.divejson    |   82 +-
 fixtures/invalid/dangling-reference.divejson  |   82 +-
 fixtures/invalid/deco-model-gf-order.divejson |   82 +-
 fixtures/invalid/device-empty-member.divejson |   84 +-
 .../dive-profile-outside-recording.divejson   |   79 +-
 .../dive-readout-outside-recording.divejson   |  703 ++++
 .../invalid/diver-email-too-long.divejson     |  200 +-
 fixtures/invalid/diver-name-too-long.divejson |  200 +-
 .../invalid/diver-username-too-long.divejson  |  200 +-
 ...icate-file-uuid-across-recordings.divejson |   84 +-
 .../duplicate-file-uuid-portrait.divejson     |  200 +-
 fixtures/invalid/duplicate-uuid.divejson      |   82 +-
 .../emergency-contact-without-name.divejson   |  200 +-
 .../event-without-type-or-label.divejson      |   82 +-
 .../insurance-without-provider.divejson       |  200 +-
 fixtures/invalid/missing-format.divejson      |   82 +-
 fixtures/invalid/naive-exported-at.divejson   |   82 +-
 .../invalid/non-increasing-samples.divejson   |   84 +-
 fixtures/invalid/null-member.divejson         |   82 +-
 fixtures/invalid/oxygen-helium-sum.divejson   |   82 +-
 fixtures/invalid/position-incomplete.divejson |   82 +-
 fixtures/invalid/pressure-order.divejson      |   82 +-
 .../invalid/profile-duration-short.divejson   |   82 +-
 .../recording-without-content.divejson        |   84 +-
 .../site-bbox-south-exceeds-north.divejson    |   82 +-
 fixtures/invalid/species-no-identity.divejson |   82 +-
 .../trailing-newline-datetime.divejson        |   82 +-
 fixtures/invalid/trip-dates-reversed.divejson |   82 +-
 fixtures/invalid/undefined-member.divejson    |   82 +-
 .../invalid/version-before-format.divejson    |    5 -
 fixtures/invalid/version-not-second.divejson  |    5 -
 fixtures/invalid/water-type-en13319.divejson  |  703 ++++
 fixtures/valid/demo-logbook.divejson          | 3641 +++++++++--------
 fixtures/valid/technical-dive.divejson        |  217 +-
 fixtures/valid/two-computers.divejson         |   38 +-
 fixtures/write/uddf/opendiving.divejson       |   38 +-
 fixtures/write/uddf/technical-dive.divejson   |  217 +-
 schema/1.0/divejson.schema.json               |   30 +-
 55 files changed, 5651 insertions(+), 4118 deletions(-)
 create mode 100644 fixtures/invalid/dive-readout-outside-recording.divejson
 delete mode 100644 fixtures/invalid/version-before-format.divejson
 delete mode 100644 fixtures/invalid/version-not-second.divejson
 create mode 100644 fixtures/invalid/water-type-en13319.divejson

diff --git a/SPEC_REF b/SPEC_REF
index b3b35b4..446b2ef 100644
--- a/SPEC_REF
+++ b/SPEC_REF
@@ -1 +1 @@
-929788950d59e3b8130ccdbd27811e44aeb074ff
+ed56eb3ad88c1ecbb1bdb5313004ad7a2a61f6d2
diff --git a/docs/converting.md b/docs/converting.md
index 92f994a..9ba1397 100644
--- a/docs/converting.md
+++ b/docs/converting.md
@@ -66,6 +66,12 @@ own schema forbids, and where refusing would cost a diver their logbook.
   library parser is then used for.
 - **A time of day with no seconds is read as `:00`, and reported.** §5.2's grammar requires
   them, and refusing would cost a diver a whole dive over a spelling.
+- **A date with no time of day is a date-only start, and reported.** §5.2 lets a dive's
+  `started_at` be the date alone, so a source that recorded the day and not the time gives
+  exactly that, with an `absent` finding for the time of day. Reading it as midnight would
+  put a time the source never stated into the logbook, and a real midnight dive read back
+  would be indistinguishable from it. This holds only for the dive's own start: every other
+  date-time member, a recording's own start among them, takes a date-time or nothing.
 
 ### For every XML source, a `<!DOCTYPE>` is refused outright
 
@@ -103,8 +109,8 @@ mean, a conversion by an irrational factor — which each format's mapping docum
 Arithmetic runs on decimal values parsed from the source text, not on floating point:
 `2.6 × 100` is exactly `260` that way, where the float route arrives at
 `260.00000000000003` and has to be rounded back out. Rounding to an integer is
-half-away-from-zero — a reading of 2.5 seconds is 3, not the 2 that banker's rounding
-gives.
+half-away-from-zero, at whatever grain the member counts — a sample stamped 2.5 ms in is at
+3 ms, not the 2 that banker's rounding gives.
 
 ## Identity
 
@@ -140,8 +146,9 @@ it; nothing can recover from a writer that does not keep its own ids stable.
 ## Provenance
 
 What the source said about itself — its format version, its generating application — rides
-under the `divejson` producer key in `extensions` (§5.5), because the source's own identity
-is worth keeping and the core vocabulary has nowhere for it. Each format's mapping document
+under the `divejson` producer key in `extensions`, which §5.5 reserves for converters
+following this document, because the source's own identity is worth keeping and the core
+vocabulary has nowhere for it. Each format's mapping document
 names the members it writes there.
 
 `generator` is **the converter**, not the source; §4 defines it as what produced *this*
@@ -150,10 +157,11 @@ document. `exported_at` is the moment of conversion, always offset-aware.
 ## What the format cannot hold, and what the source did not record
 
 - **A member whose type constrains the text a source may put in it is checked, not merely
-  capped.** Most source strings reach a free-text member where the only limit is a length;
-  a constrained one — an email address is the case in hand — is different. A source string
-  that the member cannot hold is read as *not recorded* and reported: a member the format
-  cannot hold is a member the source did not fill in. A converter that passed it through
+  capped.** Most source strings reach a free-text member that takes any text, up to a
+  length where the member has one; a constrained one — an email address is the case in
+  hand — is different. A source string that the member cannot hold is read as *not
+  recorded* and reported: a member the format cannot hold is a member the source did not
+  fill in. A converter that passed it through
   would emit a document that fails its own validation, and since that is treated as the
   converter's bug rather than the file's, one unusable header field would discard an entire
   logbook. Any mapping added later that lands a source string on a constrained member owes
@@ -237,6 +245,14 @@ about the dive, and the recording is where it lives.
   format that states a dive's start once. A source that timestamps each computer's record
   separately — `.ssrf`'s `<divecomputer @date @time>` — states one per recording, and
   writing it is what keeps a second computer's samples on their own axis.
+- **A readout goes on the recording its computer produced** (§6.4a). A source that states
+  one per computer's record — a FIT file, a Suunto export, one per file — gives it to that
+  recording. A source that states one on the **dive** — Subsurface's `<dive @cns>` and
+  `@otu`, UDDF's `<surfacepressure>` — gives it to the recording its first computer
+  produced, the primary, and reports it `resolved` where the dive has more than one
+  recording, the file not saying which computer computed it. A dive with a readout and no
+  recording otherwise gets one carrying the readout alone, which §6.4a allows: the figure is
+  a computer's, whether or not the file said which.
 - **A device is data on a recording, never a gear item.** The two can describe one piece
   of hardware; they are not one record. A converter that minted a `computer` gear item per
   dive from a model string would fill a logbook's kit list with duplicates of one computer,
@@ -313,11 +329,12 @@ readings beside 29 temperatures keeps both, rather than gaining 402 invented one
   make. This is reported, unlike a dive that simply carries no samples: the source did
   record a profile, and this is the converter unable to carry it — the same class as a
   dropped sample rather than an absence.
-- Source sample times are commonly fractional while §6.5's `times` are strictly increasing
-  integers, so **two readings of one channel that round to the same second keep the first
-  and report the second**. The collision is **per channel, not per source record**: §6.5
+- §6.5's `times` are milliseconds, so a source's seconds are multiplied by a thousand and
+  rounded to the whole millisecond — which keeps every sub-second offset a source states —
+  and **two readings of one channel that round to the same millisecond keep the first and
+  report the second**. The collision is **per channel, not per source record**: §6.5
   gives every channel its own `times`, so readings of *different* channels landing on one
-  second are collected into one sample rather than competing for it. Sources that append
+  millisecond are collected into one sample rather than competing for it. Sources that append
   each sensor's stream as its own record — a depth here, a temperature there, almost never
   two at once — are common, and offering those records to the axis one at a time makes the
   axis choose between two readings that were never in competition, losing real ones by it.
diff --git a/docs/fit-mapping.md b/docs/fit-mapping.md
index c116138..ab5eece 100644
--- a/docs/fit-mapping.md
+++ b/docs/fit-mapping.md
@@ -134,6 +134,7 @@ value.
 | sample temperature | `sint8` whole degrees Celsius | tenths of a degree on a §6.5 channel |
 | tank pressure | `uint16` bar scaled by 100 | bar; tenths of a bar on a §6.5 channel |
 | elapsed and timer time | `uint32` seconds scaled by 1000 | whole seconds, halves away from zero |
+| a sample's place on the axis | `uint32` whole seconds, a `record`'s `timestamp` | milliseconds on a §6.5 axis, × 1000 |
 | CNS | `uint8` percent | percent |
 | OTU | `uint16` "OTUs" | the same number |
 | oxygen, helium | `uint8` whole percent | whole percent |
@@ -240,10 +241,10 @@ FIT has no field for what a device calls itself, so §6.4b's `name` has no sourc
 | `session.total_elapsed_time` (7), else `total_timer_time` (8), else `dive_summary.bottom_time` (11) **untested** | | `duration` |
 | `session.max_depth` (141), else `dive_summary.max_depth` (3) **untested**, else the depth samples | | `max_depth` |
 | `session.avg_depth` (140), else `dive_summary.avg_depth` (2) **untested**, else the depth samples | | `avg_depth` |
-| `dive_summary.start_cns` (5) **untested**, else `session.start_cns` (143) | | `cns_start` |
-| `dive_summary.end_cns` (6) **untested**, else `session.end_cns` (144) | | `cns_end` |
-| `dive_summary.o2_toxicity` (9) **untested**, else `session.o2_toxicity` (155) | | `otu_end` |
-| `dive_settings.water_type` (4) | | `water_type` |
+| `dive_summary.start_cns` (5) **untested**, else `session.start_cns` (143) | | the recording's `cns_start` |
+| `dive_summary.end_cns` (6) **untested**, else `session.end_cns` (144) | | the recording's `cns_end` |
+| `dive_summary.o2_toxicity` (9) **untested**, else `session.o2_toxicity` (155) | | the recording's `otu_end` |
+| `dive_settings.water_type` (4) **untested** | | the recording's `salinity` |
 
 **The duration order is what a diver means by one.** `total_elapsed_time` is the wall clock
 from the moment the dive started to the moment it ended. `total_timer_time` excludes pauses,
@@ -254,7 +255,8 @@ Garmin's `bottom_time` is deliberately last: it measures time *at depth*, not th
 which looks inconsistent and is not. The depths agree wherever both exist, and the fallback
 is for a device that summarises a dive in one message and not the other. The CNS and OTU
 totals are the *dive's*, and on a multi-dive Garmin file the session's cover the whole
-activity while the `dive_summary` describes the dive being read.
+activity while the `dive_summary` describes the dive being read. Being the computer's own
+figures, they land on the file's one recording (§6.4a) rather than on the dive.
 
 A Garmin freediving activity writes a `dive_summary` per descent **plus** a session-level
 one, and `reference_mesg` (0) is what separates them: the summary referring to `session` is
@@ -272,11 +274,16 @@ reader reports rather than fills: the XML records `<CnsStart>8</CnsStart>` and t
 carries no `start_cns` at all, which is why that member is the one `absent` line both
 fixtures raise.
 
-`water_type`'s enum is `{fresh, salt, en13319, custom}`, and three of the four are §6.2
-members under the same name. `en13319` stays `en13319` rather than being folded into `salt`:
-it is the calibration a computer ships set to, and rewriting it as the nearest real water
-would be inventing a reading. `custom` says the diver dialled in a `water_density` number,
-which §6.2 has nowhere to put, and is reported rather than rounded off. A device that wrote
+`water_type`'s enum is `{fresh, salt, en13319, custom}`, and three of the four are §6.4a
+`salinity` values under the same name: the field is the density the computer was set to,
+which is a setting of that device and not a record of the water, so it reaches the
+recording and never the dive's `water_type`. `en13319` stays `en13319` rather than being
+folded into `salt`: it is the calibration a computer ships set to, and rewriting it as the
+nearest real water would be inventing a reading. `custom` says the diver dialled in a
+`water_density` number, which §6.4a has nowhere to put, and is reported rather than rounded
+off. No file in the corpus carries a `dive_settings.water_type`
+([`fixtures/README.md`](../fixtures/README.md#fit), the `suunto-d5.fit` row), which is why
+the row is untested. A device that wrote
 no `dive_settings` raises nothing — the message is the computer's *configuration* rather
 than a record of the dive, unlike the session summaries above, every one of which the
 device was describing this dive when it left empty.
@@ -447,16 +454,17 @@ source defect rather than a scale to reinterpret: the profile states the unit ou
 | `temperature` (13) | | the `temperature` channel, tenths of a degree |
 | `position_lat` (0) / `position_long` (1) | | `entry_position` / `exit_position` |
 
-The axis origin is the session's own `start_time`, so the profile's seconds are elapsed time
-from the instant `started_at` names; a file whose session recorded no start time falls back
+The axis origin is the session's own `start_time`, so the profile's axis is the elapsed
+milliseconds from the instant `started_at` names — whole seconds multiplied by a thousand,
+`timestamp` carrying nothing finer; a file whose session recorded no start time falls back
 to its earliest reading. The rest of the axis — ordering by recorded time, the sample with no
-time, two samples on one second, a dive whose samples carry nothing this format can hold — is
-`converting.md`'s and shared with every other format.
+time, two samples on one instant, a dive whose samples carry nothing this format can hold —
+is `converting.md`'s and shared with every other format.
 
 **Each channel takes only the records that carried its reading.** A Suunto Ocean writes 4,295
 `record`s of which 431 carry a depth and 4,294 a temperature, and padding either to the
 other's length would invent nearly four thousand depths the dive never reached. A `record`
-and a `tank_update` on one second are one sample rather than two, by `converting.md`'s
+and a `tank_update` on one timestamp are one sample rather than two, by `converting.md`'s
 per-channel collision rule — the two carry different channels and were never in
 competition.
 
diff --git a/docs/ssrf-mapping.md b/docs/ssrf-mapping.md
index 05eb4ee..7949593 100644
--- a/docs/ssrf-mapping.md
+++ b/docs/ssrf-mapping.md
@@ -77,19 +77,20 @@ in a converter, are in `converting.md`.
 | --- | --- | --- | --- | --- |
 | `profile.depth` values | centimetres | `<sample @depth>` | `'1.45 m'` | × 100 |
 | `profile.temperature` values | tenths of a °C | `<sample @temp>` | `'24.4 C'` | × 10 |
-| `profile.duration`, `times` | seconds | `<sample @time>` | `'0:10 min'` | `M × 60 + S` |
+| `profile.duration`, `times` | milliseconds | `<sample @time>` | `'0:10 min'` | `(M × 60 + S) × 1 000` |
 | `duration` | seconds | `<dive @duration>` | `'66:50 min'` | `M × 60 + S` |
 | `max_depth`, `avg_depth` | metres | `<depth @max>`, `@mean` | `'45.91 m'` | — |
 | `bottom_temperature` | °C | `<temperature @water>` | `'22.4 C'` | — |
 | `cylinders[].volume` | litres | `<cylinder @size>` | `'12.0 l'` | — |
 | `cylinders[].start_pressure`, `.end_pressure` | bar | `<cylinder @start>`, `@end` | `'200.0 bar'` | — |
 | `cylinders[].oxygen`, `.helium` | percent | `<cylinder @o2>`, `@he` | `'32.0%'` | — |
-| `cns_end` | CNS % | `<dive @cns>` | `'11%'` | — |
-| `otu_end` | OTU | `<dive @otu>` | `'31'` | — |
+| a recording's `cns_end` | CNS % | `<dive @cns>` | `'11%'` | — |
+| a recording's `otu_end` | OTU | `<dive @otu>` | `'31'` | — |
 | `number` | — | `<dive @number>` | `'45'` | — |
 
-**The two channel rows are the trap**, exactly as `converting.md` says: they carry a scale
-the scalar rows beside them do not, and the most-executed conversion in this module is the
+**The three profile rows are the trap**, exactly as `converting.md` says: they carry a
+scale the scalar rows beside them do not — the axis a thousand, where the dive's own
+`duration` beside it takes none — and the most-executed conversion in this module is the
 first of them. The bare-count rows are a unit too — a `%` on an `@otu` is as much a refusal
 as a `ft` on a depth.
 
@@ -154,8 +155,8 @@ and no version.
 | `@number` | `number` |
 | `@duration` | `duration` |
 | `@divesiteid` | `site_uuids`, one entry |
-| `@cns` | `cns_end` |
-| `@otu` | `otu_end` |
+| `@cns` | the primary recording's `cns_end` — see below |
+| `@otu` | the primary recording's `otu_end` |
 | `<notes>` | `notes` |
 | `<cylinder>` | `cylinders[]` |
 | `<divecomputer><depth @max>`, `@mean` | `max_depth`, `avg_depth` — **the first element's only**, see below |
@@ -200,13 +201,19 @@ naming: the same logbook's other exports do carry a time zone, and taking one fr
 would be this converter asserting a zone the file does not. `converting.md` forbids
 supplying one, and §5.2 is what it is protecting.
 
-A dive with no `@date` is dropped, since §6.2 makes `started_at` REQUIRED. A `@time` missing
-its seconds is read as `:00` and reported, which is `converting.md`'s leniency: a
-hand-edited save file writes exactly that, and without it one such dive would fail a
-converter's own output validation and cost the whole logbook.
+A dive with no `@date` is dropped, since §6.2 makes `started_at` REQUIRED. A `@date` with no
+`@time` at all is a date-only start (§5.2), with the time of day reported absent — the rule
+is `converting.md`'s, and no pair here reaches it. A `@time` missing its seconds is read as
+`:00` and reported, which is `converting.md`'s leniency: a hand-edited save file writes
+exactly that, and without it one such dive would fail a converter's own output validation
+and cost the whole logbook.
 
-`@cns` and `@otu` are the dive's *end* figures. Subsurface records no starting pair, so
-`cns_start` and `otu_start` have no source here.
+`@cns` and `@otu` are the *end* figures of the computer that computed them. Subsurface
+records no starting pair, so `cns_start` and `otu_start` have no source here. They sit on the
+`<dive>` rather than on a `<divecomputer>`, so they go where `converting.md` sends a
+dive-level readout: onto the primary recording, reported `resolved` where the dive has more
+than one, and onto a recording of their own where no `<divecomputer>` yields one. No pair
+here carries either figure on a two-computer dive.
 
 Zero is read two different ways, which is `converting.md`'s zero rule meeting two members
 with different constraints. A `<depth @max>` or `@mean` of `0.0 m` is **not recorded** —
@@ -278,8 +285,10 @@ the diver called their computer.
 ## This format settles no ambiguity
 
 `converting.md` defines a `resolved` finding for a value the source recorded whose scale,
-units or *meaning* are genuinely in doubt. **This reader emits none**, and that is a property
-of the format rather than an omission. There is no scale to settle: every measurement states
+units or *meaning* are genuinely in doubt. **This reader emits one, and it is not about a
+scale**: the dive-level `@cns` and `@otu` above, on a dive with more than one recording, where
+the file does not say whose figures they are. Past that the absence is a property of the
+format rather than an omission. There is no scale to settle: every measurement states
 its unit, so there is no fraction-or-percent and no litres-or-cubic-metres for a magnitude
 test to reach. Where UDDF's `<o2>0.32</o2>` and `<o2>34</o2>` are both schema-valid and mean
 the same gas, `.ssrf` writes `o2='32.0%'` and there is nothing left to decide. And there is
@@ -290,12 +299,13 @@ writer needs two writers to tell apart.
 `profile.duration` is the other thing that is not a finding, for `converting.md`'s reason:
 §6.4 defines it as the span of the profile's own samples, so taking the largest sample time
 is structural rather than derived. It is regularly longer than the dive's own `@duration` —
-4300 against 4010 on the reference logbook's first dive — and samples are never trimmed to
-make the two agree.
+a 4300 s span against 4010 s on the reference logbook's first dive — and samples are never
+trimmed to make the two agree.
 
-**So the report this reader produces carries two kinds and only two: `absent` and
-`dropped`.** No pair in `fixtures/ssrf/` expects another, and a `resolved` finding appearing
-there would mean a reader had started guessing at a scale.
+**So the report this reader produces carries `absent` and `dropped`, and `resolved` for
+that one question of where.** No pair in `fixtures/ssrf/` expects a `resolved` finding, and
+one appearing anywhere but on a dive-level readout would mean a reader had started guessing
+at a scale.
 
 ## Two things read and deliberately not carried
 
@@ -378,21 +388,22 @@ exporter's doing. Everything else in both documents is equal.
 - **`bottom_temperature`** — a temperature here (`22.4` on the first dive; each dive has its
   own), absent there, on all eight dives. The UDDF export carries no `<lowesttemperature>`
   for the water temperature the save file keeps.
-- **`cns_end`** — a CNS figure here (`11` on the first dive), absent there, on the seven
-  dives whose `<dive>` carries an `@cns`. The UDDF export writes no CNS anywhere in the
-  document — not on a dive, not on a waypoint — for the figure the save file keeps. The
-  eighth dive carries neither `@cns` nor `@otu`, and there the two readings agree.
-- **`otu_end`** — an OTU figure here (`31` on the first dive), absent there, on the same
-  seven dives, and absent from the UDDF export for the same reason. Where a UDDF document
-  does carry these two they are per-waypoint series rather than the dive's end scalar, and
-  `uddf-mapping.md` records this reader declining to derive a scalar from them; that policy
-  never comes into play here, because there is nothing in the export to derive from.
+- **`cns_end`**, on the recording — a CNS figure here (`11` on the first dive), absent
+  there, on the seven dives whose `<dive>` carries an `@cns`. The UDDF export writes no CNS
+  anywhere in the document — not on a dive, not on a waypoint — for the figure the save file
+  keeps. The eighth dive carries neither `@cns` nor `@otu`, and there the two readings agree.
+- **`otu_end`**, on the recording — an OTU figure here (`31` on the first dive), absent
+  there, on the same seven dives, and absent from the UDDF export for the same reason. Where
+  a UDDF document does carry these two they are per-waypoint series rather than the
+  recording's end scalar, and `uddf-mapping.md` records this reader declining to derive a
+  scalar from them; that policy never comes into play here, because there is nothing in the
+  export to derive from.
 - **`sites[].location`** — a place named after the site itself there, absent here, on all
   five sites. The exporter writes a `<geography><location>` holding exactly what `<name>`
   holds, and the UDDF reader carries it into `location.name` because §6.10's `location` is a
   real member and a reader cannot know that a writer filled it by copying. The save file's
   `<site>` has one name and no second field to copy it into. This is the one difference
-  `dives` cannot see: the other seven all live on a dive.
+  `dives` cannot see: the other seven all live on a dive or its recording.
 
 The record UUIDs differ too, and always will: each format has its own frozen identity
 namespace, so the same site converted through both paths is two records. `converting.md`
diff --git a/docs/suunto-json-mapping.md b/docs/suunto-json-mapping.md
index 9bc0a69..e461611 100644
--- a/docs/suunto-json-mapping.md
+++ b/docs/suunto-json-mapping.md
@@ -105,6 +105,7 @@ validates perfectly and describes a dive nobody took.
 | `Samples[].Latitude` / `Longitude` | **radians** | decimal degrees at six places | × 180/π |
 | `DiveRouteOrigin.Latitude` / `Longitude` | **degrees** | decimal degrees, exactly as recorded | — |
 | `DiveTime`, `Duration` | seconds, fractional | whole seconds, halves away from zero | — |
+| `Samples[].TimeISO8601` | an ISO 8601 instant, fractional | **milliseconds** on a §6.5 axis, elapsed from `Header.DateTime` | the difference × 1 000, halves away from zero |
 | `NoDecTime`, `TimeToSurface` | seconds | **seconds** on a §6.5 channel | — |
 | `RtGradientFactors.gf99`, `.gfSurface` | whole percent | **whole percent** on a §6.5 channel | — |
 
@@ -198,18 +199,19 @@ than an empty record (§6.4a). `fixtures/suunto_json/header-only.json` is that s
 | `Header.DiveTime`, else `Header.Duration` | | `duration` |
 | `Header.Depth.Max` | | `max_depth` |
 | `Header.DepthAverage`, else `Header.Depth.Avg` | | `avg_depth` |
-| `Diving.StartTissue.CNS` × 100 | | `cns_start` |
-| `Diving.EndTissue.CNS` × 100 | | `cns_end` |
-| `Diving.StartTissue.OTU` | | `otu_start` |
-| `Diving.EndTissue.OTU` | | `otu_end` |
-| `Diving.SurfacePressure` ÷ 100 000 | | `surface_pressure` |
+| `Diving.StartTissue.CNS` × 100 | | the recording's `cns_start` |
+| `Diving.EndTissue.CNS` × 100 | | the recording's `cns_end` |
+| `Diving.StartTissue.OTU` | | the recording's `otu_start` |
+| `Diving.EndTissue.OTU` | | the recording's `otu_end` |
+| `Diving.SurfacePressure` ÷ 100 000 | | the recording's `surface_pressure` |
 | `Diving.DiveMode` | | the recording's `mode`, by the table below |
 | `Diving.Algorithm` | | `deco_model.name` verbatim, and `deco_model.algorithm` by the table below |
 | `Diving.Conservatism` | | `deco_model.conservatism` |
 
-**The mode and the model are the recording's, not the dive's** (§6.4a), and only the D5
-header shape states them: the Ocean shape has no `Header.Diving` at all, so an Ocean file
-yields the channels below and no `deco_model`, which is correct rather than a gap.
+**The mode, the model and the readouts are the recording's, not the dive's** (§6.4a), and
+only the D5 header shape states them: the Ocean shape has no `Header.Diving` at all, so an
+Ocean file yields the channels below and no `deco_model` and no readout, which is correct
+rather than a gap.
 
 | `Diving.DiveMode` | `mode` | seen on |
 | --- | --- | --- |
@@ -264,7 +266,7 @@ An average depth deeper than the maximum cannot be, and the average is dropped.
 | `TankSize` × 1 000 | | `volume` |
 | `StartPressure` ÷ 100 000 | | `start_pressure` |
 | `EndPressure` ÷ 100 000 | | `end_pressure` |
-| `PO2` ÷ 100 000 | | `po2_limit` |
+| `PO2` ÷ 100 000 | | `ppo2_limit` |
 | `State` | | `role`, through the table below |
 
 **The block is authoritative where it exists** and the sample telemetry adds nothing to it.
@@ -337,14 +339,14 @@ channels keep. So a converted dive's last channel value and its cylinder's `end_
 disagree, on purpose, and every fixture with a `DiveTime` and a pressure channel encodes that.
 
 **The extremes are taken over the samples' own recorded instants, not off the profile.**
-The merged axis is not what loses them — it folds an entry into a second another channel's
+The merged axis is not what loses them — it folds an entry into an instant another channel's
 entry already holds rather than dropping it, which is `converting.md`'s collision rule
 read per channel, and *The profile* below is where this exporter's habit of appending its
 sensor streams separately makes that rule visible. Two other readings do,
 and both are measured on the dive `suunto-ocean.json` is reduced from, whose start pressure
-is 211.625 bar: an **unmerged** axis, one entry per second with the first winning it whole,
-gives 211.26562, the earlier depth entry taking the second and carrying the cylinder reading
-0.1 s later away with it; and the axis's pressure **channel**, which §6.5 stores in tenths
+is 211.625 bar: an **unmerged** whole-second axis, one entry per second with the first
+winning it whole, gives 211.26562, the earlier depth entry taking the second and carrying
+the cylinder reading 0.1 s later away with it; and the axis's pressure **channel**, which §6.5 stores in tenths
 of a bar, gives 211.6, which is a rounding of a value the source recorded and so is
 `converting.md`'s rule the other way round.
 
@@ -373,7 +375,7 @@ switch that happened, and saying so is honest where guessing a position would no
 
 | member | | into |
 | --- | --- | --- |
-| `TimeISO8601` | | the sample's second, elapsed from `Header.DateTime` |
+| `TimeISO8601` | | the sample's instant, in milliseconds elapsed from `Header.DateTime` |
 | `Depth` | | the `depth` channel, centimetres |
 | `Ceiling` | | the `ceiling` channel, centimetres, **where it is above zero** |
 | `Temperature` | | the `temperature` channel, tenths of a degree Celsius |
@@ -388,10 +390,13 @@ switch that happened, and saying so is honest where guessing a position would no
 **This exporter is what made `converting.md`'s collision rule per channel.** It appends its
 sensor streams as separate entries: on the dive `suunto-ocean.json` is reduced from, 7 477
 entries carry a depth, a temperature, a satellite fix or a battery reading, almost never two
-of those at once, and they collide on the whole seconds §6.5 requires. Offering them to the
-axis one at a time leaves it choosing between a depth and a temperature recorded at the same
-instant, and keeps 345 of that dive's 431 depths; merging them keeps all 431 — the count the
-same dive's FIT reading gives.
+of those at once. On a whole-second axis they collide: offering them one at a time leaves
+the axis choosing between a depth and a temperature recorded within one second, and keeps
+345 of that dive's 431 depths, where merging them keeps all 431 — the count the same dive's
+FIT reading gives. §6.5's axis is milliseconds, which places each entry at its own stated
+instant and keeps the sub-second offsets the export writes: `suunto-ocean.json`'s first three
+depths sit at 160, 1 200 000 and 4 000 020 ms. The per-channel rule is what still decides two
+entries of different channels stamped the same millisecond.
 
 **Samples are ordered by their own recorded time.** The union of an Ocean export's sample
 timestamps is not monotonic: adjacent entries go backwards by up to a second — 1.05 s is
@@ -575,10 +580,10 @@ unit, and neither is in doubt.
   cylinder; a start time with no UTC offset; a zero in a member whose schema makes zero a
   placeholder; a member the header does not state.
 - **`dropped`** — an activity that is not a dive; a start time that is not one; a sample
-  with no `TimeISO8601`; a sample before the dive began; one channel twice on a second; an
-  end pressure above its start; a pressure, ppO₂ limit or surface pressure outside what §6
-  allows; a mix whose halves sum above 100 %; cylinders past the cap; samples that carry a
-  time and no reading this format can hold.
+  with no `TimeISO8601`; a sample before the dive began; one channel twice on a
+  millisecond; an end pressure above its start; a pressure, ppO₂ limit or surface pressure
+  outside what §6 allows; a mix whose halves sum above 100 %; cylinders past the cap; samples
+  that carry a time and no reading this format can hold.
 - **`inferred`** — never. This export summarises its own dive, so there is nothing for this
   reader to compute, and `extensions.divejson.inferred` is never written.
 - **`resolved`** — never, as above.
diff --git a/docs/suunto-xml-mapping.md b/docs/suunto-xml-mapping.md
index b9b4760..4078dbc 100644
--- a/docs/suunto-xml-mapping.md
+++ b/docs/suunto-xml-mapping.md
@@ -138,7 +138,7 @@ both makes it visible. Each row below is cross-checked that way.
 trap worth stating twice. Read at the cylinder scale, `104900` would be 104.9 bar — a
 hundred metres of seawater, at the surface. Two things settle it: every one of the 384
 exports lands in 103 100 to 106 700, which is a barometric range only on the Pascal reading,
-and §6.2's own 0.4 to 1.2 bar bound refuses the other one outright.
+and §6.4a's own 0.4 to 1.2 bar bound refuses the other one outright.
 
 ### The factor table
 
@@ -147,18 +147,18 @@ and §6.2's own 0.4 to 1.2 bar bound refuses the other one outright.
 | `<MaxDepth>`, `<AvgDepth>` | `max_depth`, `avg_depth` | metres, ×1 |
 | `<BottomTemperature>` | `bottom_temperature` | °C, ×1 |
 | `<Duration>` | `duration` | seconds, ×1, rounded to a whole one |
-| `<SurfacePressure>` | `surface_pressure` | Pascal ÷ 100 000 |
-| `<CnsStart>`, `<CnsEnd>` | `cns_start`, `cns_end` | percent, ×1 |
-| `<OtuStart>`, `<OtuEnd>` | `otu_start`, `otu_end` | count, ×1 |
+| `<SurfacePressure>` | the recording's `surface_pressure` | Pascal ÷ 100 000 |
+| `<CnsStart>`, `<CnsEnd>` | the recording's `cns_start`, `cns_end` | percent, ×1 |
+| `<OtuStart>`, `<OtuEnd>` | the recording's `otu_start`, `otu_end` | count, ×1 |
 | `<Size>` | `cylinders[].volume` | litres, ×1 |
 | `<StartPressure>`, `<EndPressure>` | `cylinders[].start_pressure`, `end_pressure` | millibar ÷ 1 000 |
 | `<Oxygen>`, `<Helium>` | `cylinders[].oxygen`, `helium` | percent, ×1 |
-| `<PO2>` | `cylinders[].po2_limit` | bar, ×1 |
+| `<PO2>` | `cylinders[].ppo2_limit` | bar, ×1 |
 | `<Depth>` | `profile.depth.values` | metres **× 100** — centimetres |
 | `<Ceiling>` | `profile.ceiling.values` | metres **× 100** — centimetres |
 | `<Temperature>` | `profile.temperature.values` | °C **× 10** — tenths |
 | `<Pressure>` | `profile.pressures[].values` | millibar **÷ 1 000 × 10** — tenths of a bar |
-| `<Time>`, `<GasChangeTime>` | sample and event times | seconds, ×1 |
+| `<Time>`, `<GasChangeTime>` | sample and event times | decimal seconds **× 1 000** — milliseconds, halves away from zero |
 
 **The channel conversions carry a scale the scalar ones do not**, and the tank-pressure
 channel carries two: millibar to bar, then §6.5's tenths. `211391` millibar is `211.391` bar
@@ -241,16 +241,20 @@ place to put them, and §6.4b is that place.
 | --- | --- | --- |
 | `<StartTime>` | `started_at` | wall clock, fraction kept, no offset supplied |
 | `<Duration>` | `duration` | the whole logged period |
-| `<Note>` | `notes` | capped at §6's length, stripped; nil on all 384 in hand |
+| `<Note>` | `notes` | stripped; nil on all 384 in hand |
 | `<MaxDepth>` | `max_depth` | a recorded reading, not a summary of the samples |
 | `<AvgDepth>` | `avg_depth` | dropped if it is deeper than `max_depth` |
 | `<BottomTemperature>` | `bottom_temperature` | recorded directly, unlike the app JSON's |
-| `<CnsStart>`, `<CnsEnd>` | `cns_start`, `cns_end` | zero is a reading: §6.2 gives them `minimum: 0` |
-| `<OtuStart>`, `<OtuEnd>` | `otu_start`, `otu_end` | as above |
-| `<SurfacePressure>` | `surface_pressure` | Pascal; outside 0.4-1.2 bar it is dropped |
+| `<CnsStart>`, `<CnsEnd>` | the recording's `cns_start`, `cns_end` | zero is a reading: §6.4a gives them `minimum: 0` |
+| `<OtuStart>`, `<OtuEnd>` | the recording's `otu_start`, `otu_end` | as above |
+| `<SurfacePressure>` | the recording's `surface_pressure` | Pascal; outside 0.4-1.2 bar it is dropped |
 | `<DiveMixtures>` | `cylinders` | below |
 | `<DiveSamples>` | the recording's `profile` | below; a profile is a member of `recordings[]` (§6.4a), never of the dive |
 
+**The oxygen clocks and the surface pressure are the computer's own figures**, and a file is
+one computer's record of one dive, so they land on its one recording (§6.4a) beside the
+profile rather than on the dive.
+
 `<Duration>` is the whole period the computer logged, and it is the only element in this
 format observed holding a dive's length. `<BottomTime>` is the time spent at depth and runs
 a third shorter — 1 028 s against 2 001 on the dive this reader is measured against — so it
@@ -272,7 +276,7 @@ starts on.
 | `<EndPressure>` | `cylinders[].end_pressure` |
 | `<Oxygen>` | `cylinders[].oxygen` |
 | `<Helium>` | `cylinders[].helium` |
-| `<PO2>` | `cylinders[].po2_limit` |
+| `<PO2>` | `cylinders[].ppo2_limit` |
 
 In document order, at most 16 per dive. The corpus has 353 mixtures across 342 exports: 331
 dives with one and 11 with two.
@@ -356,7 +360,7 @@ Three shapes, and only one of them is in the corpus.
 
 | source | channel |
 | --- | --- |
-| `<Time>` | the axis, in seconds |
+| `<Time>` | the axis, its decimal seconds in milliseconds |
 | `<Depth>` | `profile.depth` |
 | `<Ceiling>` | `profile.ceiling` |
 | `<Temperature>` | `profile.temperature` |
@@ -368,13 +372,13 @@ unaffected — so the channels sit on their own axes and none is padded to anoth
 That is `converting.md`'s no-padding rule; the reference dive carries 201 depths, 201
 temperatures and no pressures at all.
 
-**Two samples on one second are a real collision here**, unlike a source that appends each
-sensor's stream as its own record. It fires on 37 of the corpus's exports and every one of
-them is a freedive, where a 1 s sampling interval meets a `<Time>` that is not quite an
-integer; no scuba dive in hand loses a reading to it. Those 37 used to be unreachable — the
-reader stopped at `<Mode>3</Mode>` before it read a sample — so carrying freedives is what
-first made this rule fire on a real file. `fixtures/suunto_xml/freedive.xml` is one of them,
-and its expectation carries three sample seconds from five samples.
+**Two samples on one instant are a real collision here**, unlike a source that appends each
+sensor's stream as its own record. On a whole-second axis it fires on 37 of the corpus's
+exports and every one of them is a freedive, where a 1 s sampling interval meets a `<Time>`
+that is not quite an integer; no scuba dive in hand loses a reading to it. No count has been
+taken at §6.5's millisecond grain. `fixtures/suunto_xml/freedive.xml` is one of the 37, and
+its reduction repeats a whole-number `<Time>` — three samples at `1` — which collide at any
+grain, so its expectation carries three sample times from five samples.
 
 **A ceiling of zero is not a ceiling** (`converting.md`, *Profiles*). This export writes
 `i:nil` rather than a zero on every no-deco sample — its 1 760 recorded ceilings run 3.0 to
@@ -421,8 +425,8 @@ is `converting.md`'s refuse-rather-than-guess rule, not its ambiguity rule.
   than the maximum; a surface pressure or ppO₂ limit outside what §6 allows; a mix whose
   halves sum above 100 %; an end pressure above its start; a cylinder pressure past 350 bar;
   cylinders past the cap; a gas change before the dive began, or one left with no profile to
-  sit on; a sample with no `<Time>`; two samples on one second; samples that carry a time and
-  no reading this format can hold; tank readings two cylinders both claim.
+  sit on; a sample with no `<Time>`; two samples on one millisecond; samples that carry a
+  time and no reading this format can hold; tank readings two cylinders both claim.
 - **`inferred`** — never. This export summarises its own dive, so there is nothing for this
   reader to compute, and `extensions.divejson.inferred` is never written.
 - **`resolved`** — never, as above.
@@ -501,7 +505,7 @@ refusals and the second out of the silently unmapped, both into the device map a
   `<PreviousMaxDepth>`, `<TimeFromReset>`** — the device's own derived figures, several of
   them about a *series* of dives rather than this one. §6.2 has no member for any.
 - **`<OlfEnd>`** — Suunto's oxygen limit fraction, a percentage of whichever of the CNS and
-  OTU clocks is higher. §6.2 carries the two clocks themselves, which are mapped, and a
+  OTU clocks is higher. §6.4a carries the two clocks themselves, which are mapped, and a
   derived maximum of them is not a third reading.
 - **`<StartTemperature>` and `<EndTemperature>`** — §6.2 carries one water temperature,
   `bottom_temperature`, and `<BottomTemperature>` is the element that states it. The full
diff --git a/docs/uddf-mapping.md b/docs/uddf-mapping.md
index 05b02d2..b549c68 100644
--- a/docs/uddf-mapping.md
+++ b/docs/uddf-mapping.md
@@ -82,7 +82,7 @@ in a converter, are in `converting.md`.
 | `profile.depth` values | centimetres | `<waypoint><depth>` | metres | × 100 |
 | `profile.temperature` values | tenths of a °C | `<waypoint><temperature>` | Kelvin | (K − 273.15) × 10 |
 | `profile.pressures[]` values | tenths of a bar | `<waypoint><tankpressure>` | Pascal | ÷ 100 000 × 10 |
-| `profile.duration`, `times` | seconds | `<waypoint><divetime>` | seconds | — |
+| `profile.duration`, `times` | milliseconds | `<waypoint><divetime>` | seconds, `xs:float` | × 1 000, to a whole millisecond |
 | `profile.ndl` values | seconds | `<waypoint><nodecotime>` | seconds | — |
 | `profile.ppo2` values | hundredths of a bar | `<waypoint><calculatedpo2>` | bar or Pascal, and see below | × 100, or ÷ 1000 |
 | `profile.cns` values | tenths of a percent | `<waypoint><cns>` | percent | × 10 |
@@ -91,10 +91,10 @@ in a converter, are in `converting.md`.
 | `max_depth`, `avg_depth` | metres | `<greatestdepth>`, `<averagedepth>` | metres | — |
 | `bottom_temperature` | °C | `<lowesttemperature>` | Kelvin | K − 273.15 |
 | `cylinders[].start_pressure`, `.end_pressure` | bar | `<tankpressurebegin>`, `<tankpressureend>` | Pascal | ÷ 100 000 |
-| `surface_pressure` | bar | `<surfacepressure>` | Pascal | ÷ 100 000 |
+| a recording's `surface_pressure` | bar | `<surfacepressure>` | Pascal | ÷ 100 000 |
 | `cylinders[].volume` | litres | `<tankvolume>` | cubic metres | × 1000, and see below |
 | `cylinders[].oxygen`, `.helium` | percent | `<o2>`, `<he>` | fraction | × 100, and see below |
-| `cylinders[].po2_limit` | bar | `<maximumpo2>` | bar | — the one pressure UDDF does not express in Pascal |
+| `cylinders[].ppo2_limit` | bar | `<maximumpo2>` | bar | — the one pressure UDDF does not express in Pascal |
 | `weight` | kilograms | `<leadquantity>` | kilograms | — |
 | `visibility`, `altitude` | metres | `<visibility>`, `<altitude>` | metres | — |
 
@@ -329,20 +329,22 @@ its own repeated element — the carve-out included, and in `converting.md`'s ow
 link that yields **neither a device nor a profile** yields no recording, §6.4a forbidding
 one that carries nothing.
 
-**The first link is where the dive's own once-per-dive facts land**, both of them, because
-UDDF states each once per **dive** and never once per computer:
+**The first link is where the dive's own once-per-dive facts land**, all three of them,
+because UDDF states each once per **dive** and never once per computer:
 
 - **Its `<samples>` become that first recording's profile.** A dive has one `<samples>`
   element, so there is nothing to give the others and nothing to divide, and every recording
-  after the first is device-only. That profile is also the only thing that carries a link
-  past the carve-out without a device, and it reaches exactly one link — so **where the dive
-  has a profile**, the first link is a recording whether or not its element names a device,
-  exactly as a dive linking no computer at all is one recording made of its samples alone,
-  and the carve-out bites only on the *later* links whose elements name none. **Where the
-  dive has no profile** — an absent `<samples>`, or samples `converting.md` found wholly
-  unusable — there is nothing to protect any link, so every one of them is judged on its
-  device alone, the first included, and a dive whose elements all name none has no recordings
-  at all.
+  after the first is device-only. That profile, with the surface pressure below, is the
+  only thing that carries a link past the carve-out without a device, and it reaches exactly
+  one link — so **where the dive has a profile**, the first link is a recording whether or
+  not its element names a device, exactly as a dive linking no computer at all is one
+  recording made of its samples alone, and the carve-out bites only on the *later* links
+  whose elements name none. **Where the dive has neither a profile nor a surface pressure** —
+  an absent `<samples>`, or samples `converting.md` found wholly unusable — there is nothing
+  to protect any link, so every one of them is judged on its device alone, the first
+  included, and a dive whose elements all name none has no recordings at all.
+- **Its `<surfacepressure>` goes to that first link's recording**, a readout being enough to
+  make one (§6.4a) the way a profile is — *Dives* below.
 - **Its `<internaldivenumber>` joins that first link's device**, and only that one's. It is a
   child of the dive (above), so a dive linking two computers has one counter and no way to
   say whose it is; giving it to the first is the only reading that does not put one machine's
@@ -379,7 +381,7 @@ carries nothing this format records.
 | `informationbeforedive/divenumber` | `number` |
 | `informationbeforedive/link/@ref` | `site_uuids`, in source order, the first being the primary site |
 | `informationbeforedive/altitude` | `altitude` |
-| `informationbeforedive/surfacepressure` | `surface_pressure` |
+| `informationbeforedive/surfacepressure` | the primary recording's `surface_pressure` — see below |
 | `informationbeforedive/equipmentused/leadquantity` | `weight` |
 | `informationafterdive/diveduration` | `duration` |
 | `informationafterdive/greatestdepth` | `max_depth` |
@@ -393,9 +395,19 @@ untouched; a dive with no `<datetime>` at all is dropped, since §6.2 makes `sta
 REQUIRED.
 
 Two truncations are forgiven, both real writer output rather than hypotheticals:
-`2002-06-18T` and a bare `2002-06-18` are read as midnight on that date and reported.
-Subsurface emits the first for a midnight dive, its stylesheet building the string with an
-unguarded concatenation. Dropping the dive over it would lose a dive to a writer's typo.
+`2002-06-18T` and a bare `2002-06-18` are read as a **date-only start** (§5.2), with the time
+of day reported absent — `converting.md`'s rule, and not midnight, which neither string
+states. Subsurface emits the first for a midnight dive, its stylesheet building the string
+with an unguarded concatenation; a dive that really began at midnight therefore comes back as
+its date, which is that writer's loss rather than a reading this reader could recover.
+Dropping the dive over either would lose a dive to a writer's typo.
+
+**`<surfacepressure>` is the dive's element and a recording's figure.** §6.4a puts the
+surface pressure a computer used on that computer's recording, and UDDF states one per dive,
+so it goes where `converting.md` sends a dive-level readout: onto the primary recording — the
+first link's, *Device* above — reported `resolved` where the dive has more than one, and onto
+a recording of its own where the dive yields none. No file in this corpus links two
+computers, so the `resolved` case has no pair.
 
 Zero is read two different ways here, which is `converting.md`'s zero rule meeting two
 members with different constraints. A `<greatestdepth>` or `<averagedepth>` of `0` is **not
@@ -420,7 +432,7 @@ and one that resolves to nothing at all is reported as a source defect.
 | `tankpressureend` | `cylinders[].end_pressure` |
 | `link/@ref` → `gasdefinitions/mix/o2` | `cylinders[].oxygen` |
 | `link/@ref` → `gasdefinitions/mix/he` | `cylinders[].helium` |
-| `link/@ref` → `gasdefinitions/mix/maximumpo2` | `cylinders[].po2_limit` |
+| `link/@ref` → `gasdefinitions/mix/maximumpo2` | `cylinders[].ppo2_limit` |
 
 `<gasdefinitions>` is not a collection of its own: DiveJSON carries the blend on the
 cylinder that held it, so a mix nothing links to travels nowhere.
@@ -453,8 +465,11 @@ inventing 402 readings.
 
 - `<divetime>` is optional in the schema and is the only thing that can place a reading, so
   a waypoint without one is the timeless sample `converting.md` drops and reports.
-- `<divetime>` is `xs:float` while §6.5's `times` are integers, which is what makes the
-  same-second collision rule fire on real files.
+- `<divetime>` is `xs:float` seconds while §6.5's `times` are whole milliseconds, so each is
+  multiplied by a thousand and rounded, a fraction the file states is kept, and two waypoints
+  that round to one millisecond are `converting.md`'s collision.
+  `fixtures/uddf/legacy-writer.uddf` writes a `30.4` beside a `30`: one second, two
+  milliseconds, so both readings are kept.
 - A `<setmarker>` whose text is exactly `deep_stop`, `safety_stop` or `bookmark` becomes
   that event type; anything else becomes an event with **no `type`** and the text as its
   `label`, which §6.6 makes the spelling of an unclassified event. `<setmarker>` is a bare
@@ -498,7 +513,7 @@ inventing 402 readings.
   carries it through.
 - **Two cylinders on one blend link the same `<mix>`**, so a `@ref` resolves to a *list* of
   cylinders and repeated references on one waypoint take them in order. Collapsing them
-  would put two readings on one second, which §6.5 forbids, and would say the diver carried
+  would put two readings on one instant, which §6.5 forbids, and would say the diver carried
   one bottle. A `<tankpressure>` with no `@ref` at all — which the documentation permits for
   a linked double measured at one pressure — is taken as the dive's cylinder when there is
   exactly one, and dropped when there is a choice to get wrong.
@@ -594,12 +609,12 @@ sort of thing that arrives without the heading being corrected.
 `<diveduration>` is the dive's *logged* duration and maps to `dive.duration`. §6.4 makes
 `profile.duration` REQUIRED and at least the largest sample time in any channel — a
 different quantity, and in practice a larger one: `<diveduration>` is **shorter** than the
-sample span in both real exports on record, 4010 against 4300 and 4001 against 4288.
+sample span in both real exports on record, 4010 s against 4300 s and 4001 s against 4288 s.
 
 **Take the largest sample time across every channel. Never trim samples to make
 `<diveduration>` fit** — that would delete recorded readings to satisfy a number, which is
 exactly §5.4's violation. DiveJSON's own reference writer produces the same shape, a
-`profile.duration` of 4301 over a logged `duration` of 4001. §6.4 defines the member as the
+profile spanning 4301 s over a logged `duration` of 4001. §6.4 defines the member as the
 span of the samples themselves, so reading it off them is structural rather than derived,
 and it carries no finding of any kind.
 
@@ -658,10 +673,11 @@ writes all three that way.
 | UDDF | why not |
 | --- | --- |
 | `<waypoint><decostop>` | a stop *schedule*, not a ceiling sample: `@duration` is required on it and a ceiling has none, several may appear on one waypoint, and no writer in the corpus emits any. `profile.ceiling` waits for a real file to map from. |
-| `<waypoint><otu>` | §6.4 has a `cns` channel and no OTU one, and no file in hand carries this element. Deriving the dive's `otu_start`/`otu_end` scalars from the last sample would present a derivation as recorded data, which §5.7 forbids. |
+| `<waypoint><otu>` | §6.4 has a `cns` channel and no OTU one, and no file in hand carries this element. Deriving a recording's `otu_start`/`otu_end` from the last sample would present a derivation as recorded data, which §5.7 forbids. |
 | `<waypoint><measuredpo2>` | per cell by construction: its `@ref` to an O₂ sensor is mandatory and the element may repeat inside one waypoint, once per sensor. §6.4's `ppo2` is the one figure the computer calculated, which is `<calculatedpo2>`; a per-cell reading has no member yet. |
 | `<waypoint><alarm>`, `<setpo2>`, `<heading>`, `<pulserate>` | no core member, and no fixture to map against. `<setpo2>` is a *maximum tolerated* ppO₂ rather than a rebreather setpoint, which is the member it would otherwise look like. |
 | `<decomodel><vpm>`, `<rgbm>` | no file in hand carries either, so §6.4c's `algorithm` has no value seeded for them yet. |
+| `<calculateprofile><profile><density>` | a water density in kg/m³ — Shearwater Cloud Desktop writes `1030` — beside the recalculation's model, a route not read for the reason *The decompression model* gives. §6.4a's `salinity` is a named setting and carries no density: the two are different members, neither derivable from the other, and a density arrives in a minor version when a reader maps one. |
 | `<informationbeforedive><surfaceintervalbeforedive>` | no core member. |
 | `<informationafterdive><rating>`, `<current>`, `<problems>` | no core member. |
 | `<site><ecology>` | site-level flora and fauna, where §6.11's species are per-dive sightings. |
diff --git a/docs/uddf-writing.md b/docs/uddf-writing.md
index 8298756..d517815 100644
--- a/docs/uddf-writing.md
+++ b/docs/uddf-writing.md
@@ -465,14 +465,38 @@ a dive of no length.
 `started_at` is written **exactly as recorded**, offset and sub-second fraction and all;
 §5.2's rule that an offset is never supplied applies as much to a writer as to a reader.
 
-Members with no UDDF slot anywhere: `water_type`, `cns_start`, `cns_end`, `otu_start`,
-`otu_end`, `entry_position`, `exit_position`, `course_uuid`, `species_uuids`,
-`created_at`, and — on the recording rather than the dive —
+**A `started_at` that is a date goes out as the bare date**, `<datetime>2002-06-18</datetime>`,
+and nothing is reported. UDDF disagrees with itself about that spelling: its documentation
+says lower-order time and date elements may be omitted, while its XSD types `<datetime>`
+`xs:dateTime`, which a bare date fails. This writer takes the documentation's side, because
+both alternatives lose something the file could have kept. Midnight with a report line would
+be a time the document never had — a reader cannot tell it from a dive that began at midnight,
+so the round trip returns one — and dropping the dive would take a whole dive out of the file
+a diver hands to a shop. `uddf-mapping.md` reads the bare date back as the date-only start it
+was. A date **member** is another matter, and *Diver and gear* widens those to midnight: a
+`born_on` is a date whatever the file says, so a reader takes the date off the front and
+the midnight never reaches a document, where a dive's start could have been a time.
+
+The XSD assertion an implementation keeps for its output therefore widens a bare dive
+`<datetime>` for that pass alone. The pass exists to catch element order and a mandatory
+child left out, and a date's spelling is neither; exempting the element rather than the
+spelling would blind it to both. A consumer that validates against the XSD refuses the file,
+which is the price of this answer, and no consumer's handling of a bare `<datetime>` has
+been checked.
+
+`recordings[].surface_pressure` is written from the **primary** recording, to the dive's
+`<surfacepressure>` — UDDF states one per dive, and a later recording's goes with that
+recording under *What is never written*.
+
+Members with no UDDF slot anywhere: `water_type`, `entry_position`, `exit_position`,
+`course_uuid`, `species_uuids`, `created_at`, and — on the recording rather than the dive —
+`recordings[].salinity`, `recordings[].cns_start`, `cns_end`, `otu_start` and `otu_end`,
 `recordings[].source_files`, `recordings[].started_at` and
 **`recordings[].device.firmware`**, `equipmentPieceType` carrying no firmware element, so a
 `dropped` finding reports it on every export whose device has one. *Devices* above has the
-reasoning for each of the three. `source_files` was a dive member until it moved onto the
-recording (§6.4a) and the answer did not change with it.
+reasoning for the last three. UDDF's per-waypoint `<cns>` is a channel and not the clock's
+two ends, and its one density element sits on a recalculated profile rather than on the dive
+(`uddf-mapping.md`, *Deliberately not mapped*), so neither is a home for these.
 
 ### Cylinders and gases
 
@@ -512,9 +536,9 @@ reported, there being nowhere in the file to put it.
 
 ### Profiles
 
-**Every reading keeps its own second.** UDDF puts everything recorded at one instant inside
+**Every reading keeps its own instant.** UDDF puts everything recorded at one instant inside
 one `<waypoint>`, so the waypoints are the **union** of every channel's times, and a
-waypoint carries only what was measured at that second — a temperature taken between two
+waypoint carries only what was measured at that instant — a temperature taken between two
 depth samples becomes its own waypoint, with a `<divetime>` and a `<temperature>` and no
 depth.
 
@@ -535,6 +559,12 @@ data loss and a moved timestamp is a reading presented as measured where it was
 XSD's own order and not a preference — `<cns>` comes third in the type and therefore first
 in a waypoint that carries no alarm or battery reading, while `<nodecotime>` is last of all.
 
+**`<divetime>` is `xs:float` seconds** and the axis is milliseconds, so a time is divided by
+a thousand in decimal: a whole second is written as the integer it is, and a millisecond
+that is not a whole second as seconds with the fraction — `1200.02` — which a reader
+multiplies back to exactly `1200020`. The self round trip is exact, and a document whose
+samples all fall on whole seconds writes no fraction at all.
+
 Channel units: depth centimetres → metres, temperature tenths of °C → Kelvin, pressures
 tenths of a bar → Pascal, ppO₂ hundredths of a bar → bar, CNS tenths of a percent →
 percent, `ndl` seconds → seconds, `gradient_factor` whole percent → the documented fraction,
@@ -622,7 +652,7 @@ Four cases lose something, each reported:
   mix would say the diver breathed a gas they did not carry.
 
 `waypointType` allows one `<setmarker>` and one `<switchmix>`, so a **second** event of
-either kind on one second is dropped and reported.
+either kind on one instant is dropped and reported.
 
 **Differs from the reference writer**: it joins simultaneous markers with `"; "` rather than
 dropping the later one, which is right for a file a human is reading and wrong for one being
@@ -646,7 +676,7 @@ once per record that carries it, and none of them has anywhere in UDDF to go:
 | `diver.emergency_contacts` | UDDF has no element for one, and `<owner>` describes the logbook's owner and nobody else |
 | `diver.insurances[].number` | `insuranceType` holds a `name`, `aliasname`, `issuedate`, `validdate` and `notes`, with nothing for the identifier the insurer knows the diver by. `<notes>` would read back as a remark, and `<personal><membership memberid>` as a membership, which a reader cannot tell from a club's |
 | `diver.portrait_file` | `<owner>` has no image element. A `<notes><link>` to a `<mediadata><image>` names a file by path, whose bytes a UDDF file does not carry, and reads back as a linked picture with no role — `uddf-mapping.md`'s *Diver* section says why no linked image is read as a portrait |
-| a recording's `source_files`, `started_at` and its device's `firmware`, and every recording after the first | UDDF gives a dive one `<samples>`, and `equipmentPieceType` no firmware element — *Devices* above has each answer and why the device of a dropped recording is kept even so |
+| a recording's `source_files`, `started_at`, `salinity` and oxygen clocks, its device's `firmware`, and every recording after the first, its `surface_pressure` included | UDDF gives a dive one `<samples>` and one `<surfacepressure>`, `equipmentPieceType` no firmware element, and nothing at all a salinity setting or an oxygen clock's two ends could go in — *Devices* and *Dives* above have each answer, and why the device of a dropped recording is kept even so |
 | `trips[].parts[].location.bbox` | `geographyType` carries a point, not a box |
 | `sites[].location.full_name`, `position` and `bbox` | a site's `<name>` is its own, so the locality gets only `<geography><location>` and that slot holds `location.name`; `<geography>`'s coordinates are the site's pin, and the box has nowhere either — *Sites and trips* above has the asymmetry with a part |
 | a record's `extensions` | producer-defined members (§5.5) |
@@ -675,7 +705,7 @@ makes of it. Recording them here saves the next reader the round trip; they are
 of `uddf-mapping.md`'s section of the same name.
 
 - **Subsurface discards every depth-less waypoint on import.** A file written here puts a
-  reading on its own second, so a temperature or pressure sampled between two depth samples
+  reading on its own instant, so a temperature or pressure sampled between two depth samples
   is a depth-less waypoint and Subsurface will not keep it. The depth channel arrives whole.
 - **divelogs.de reads a missing depth as zero**, so the same waypoints arrive as a profile
   that saws between the real depth and the surface.
diff --git a/fixtures/README.md b/fixtures/README.md
index 8e946c7..371cf43 100644
--- a/fixtures/README.md
+++ b/fixtures/README.md
@@ -31,9 +31,9 @@ what makes a fixture dropped into this tree impossible to ignore.
 | file | what it covers |
 | --- | --- |
 | `minimal.divejson` | The smallest conforming document: `format`, `version`, `exported_at` — no diver (a source that records nothing about its owner omits the member), no collections (absent ≡ empty). |
-| `demo-logbook.divejson` | A real export of the reference writer's demo account (all names are seeded demo data; pulled 2026-09-02, courses-era writer): 8 dives, one carrying a recording with its device, its stored file and a full sampled profile, which is what a dive imported from a computer file looks like — sites, trips, an empty `courses` collection, gear with a service history, certifications, and producer extensions carrying application-specific values. Its device is written by hand: the export predates recordings, and the file it names was read by the `suunto_json` parser, so the device is what that reader takes from such a file. So are the diver's `phone`, `born_on`, `emergency_contacts` and `insurances`, one element in each array, which the export predates as well. Regenerate from a fresh export when the writer changes. |
-| `two-computers.divejson` | Hand-built coverage of §6.4a, and of the half of it no converter can reach: a dive with **two** recordings that both carry a profile — `ssrf/two-computers.ssrf` reaches that much from one file — where the first holds **two** `source_files`, one recording the app exported twice, as JSON beside FIT, each file read by a different parser. Its second recording carries its own `started_at`, 31.33 s after the dive's, so its samples sit on their own axis. Its two devices differ in every way §6.4b allows two devices to differ, and the second computer's deepest sample is deeper than the dive's logged `max_depth`, which is the ordinary disagreement between two devices rather than a defect. It has no pair: §6.7's stored-file records are the application's and no reader produces one, which is the point of it. It is also where the two halves of §6.4c the other hand-built file cannot reach live: its first recording runs an RGBM model named in words with a **negative** `conservatism` and no gradient factors, the shape a Suunto states, while its second is in **`gauge`** mode and carries no `deco_model` at all — a computer run as a bottom timer runs no decompression model, and saying so is not the same as saying nothing. Between the two files every member of §6.4c's table and two of §6.4a's five `mode` values are exercised by a document no converter wrote; `freedive` comes from `suunto_xml/freedive.xml`, and `closed_circuit` and `semi_closed` wait for a file, no source in hand stating either. |
-| `technical-dive.divejson` | Hand-built coverage of what the demo corpus lacks: trimix, a sidemount pair (two cylinders, one blend, `usage: "parallel"`), staged deco cylinders, gas-switch events, a ceiling channel with a gap, per-cylinder pressure channels, a `+12:45` UTC offset **and** an offset-less local `started_at` (§5.2's third state), a dive with no recorded duration, a common-name-only species, a trip of three parts — a place with dates, a place with none, and dates with no place — the second of them carrying an antimeridian-crossing bounding box, the corpus's only **dive site whose locality is filled in** — a full name, a centre and a box on `location`, beside the site's own pin at a different point, which is the pair §6.10 exists to keep apart — an `agency: "other"` certification with `front_file`/`back_file`, a dive-count service interval, three courses — a completed `"other"`-agency course linked from a dive and its certification, an unreferenced `"planned"` one with no dates, and one with **no `agency`**, the private-instructor case §6.17 leaves the member out for — a lowercase-`z`, one-digit-fraction `created_at` (both spellings the grammar allows and naive parsers reject), and a `bookmark` 85 s **past** `profile.duration` — the surface-marker case §6.4 blesses, which the pre-2026-09-04 validator rejected, and which also carries a `label` beside a `type`, the pairing §6.6 asks for on any value defined after 1.0. Its recording's device carries **all six** of §6.4b's members, hand-built like the rest of the file. Its diver carries an emergency contact, an insurance with a `number` and a `portrait_file`, the three members of §6.1 UDDF has no element for. It is also the **decompression** fixture: `mode: "open_circuit"` and a Bühlmann `deco_model` with a name and a 30/70 gradient-factor pair, and all six of §6.4's readout channels sampled on the depth channel's own seconds — an `ndl` that runs from the 99-minute display cap down to zero and back, a zero `ndl` at the same second as a `ceiling` (the coexistence §6.4 blesses), a `tts` present only while there is an obligation, a `ppo2` that climbs through three gases, a `cns` whose ends are the dive's own `cns_start` and `cns_end`, and a `surface_gradient_factor` above 100 with the `gradient_factor` beside it far below. Its profile's `extensions` carries a tissue-loading array, which is what §6.4c says tissue state rides until a reader can compute from it. |
+| `demo-logbook.divejson` | A real export of the reference writer's demo account (all names are seeded demo data; pulled 2026-09-02, courses-era writer): 8 dives, one carrying a recording with its device, its stored file and a full sampled profile, which is what a dive imported from a computer file looks like — sites, trips, an empty `courses` collection, gear with a service history, certifications, and producer extensions carrying application-specific values. Its device is written by hand: the export predates recordings, and the file it names was read by the `suunto_json` parser, so the device is what that reader takes from such a file. So are the diver's `phone`, `born_on`, `emergency_contacts` and `insurances`, one element in each array, which the export predates as well. Its profile axis is in milliseconds, multiplied by hand from the seconds the export wrote, and its root `extensions` carries, under the writer's producer key, the `profile_axis` marker that writer emits beside a millisecond axis and its own reader keys on — added by hand the same way, a value of the same kind as the `units` its diver carries. Regenerate from a fresh export when the writer changes. |
+| `two-computers.divejson` | Hand-built coverage of §6.4a, and of the half of it no converter can reach: a dive with **two** recordings that both carry a profile — `ssrf/two-computers.ssrf` reaches that much from one file — where the first holds **two** `source_files`, one recording the app exported twice, as JSON beside FIT, each file read by a different parser. Its second recording carries its own `started_at`, 31.33 s after the dive's, so its samples sit on their own axis. Each recording carries its own **readouts** (§6.4a), and they differ — the two answers a dive gets from two computers, which no converted pair reaches: the first carries a surface pressure and both ends of both oxygen clocks, its CNS and OTU ends being the ones the same dive's FIT export states, and the second a surface pressure of its own and nothing else. Its two devices differ in every way §6.4b allows two devices to differ, and the second computer's deepest sample is deeper than the dive's logged `max_depth`, which is the ordinary disagreement between two devices rather than a defect. It has no pair: §6.7's stored-file records are the application's and no reader produces one, which is the point of it. It is also where the two halves of §6.4c the other hand-built file cannot reach live: its first recording runs an RGBM model named in words with a **negative** `conservatism` and no gradient factors, the shape a Suunto states, while its second is in **`gauge`** mode and carries no `deco_model` at all — a computer run as a bottom timer runs no decompression model, and saying so is not the same as saying nothing. Between the two files every member of §6.4c's table and two of §6.4a's five `mode` values are exercised by a document no converter wrote; `freedive` comes from `suunto_xml/freedive.xml`, and `closed_circuit` and `semi_closed` wait for a file, no source in hand stating either. |
+| `technical-dive.divejson` | Hand-built coverage of what the demo corpus lacks: trimix, a sidemount pair (two cylinders, one blend, `usage: "parallel"`), staged deco cylinders, gas-switch events, a ceiling channel with a gap, per-cylinder pressure channels, a `+12:45` UTC offset **and** an offset-less local `started_at` (§5.2's third state), a dive with no recorded duration, a third dive whose `started_at` is a **date** — logged by hand with the day and no time of day (§5.2) — a common-name-only species, a trip of three parts — a place with dates, a place with none, and dates with no place — the second of them carrying an antimeridian-crossing bounding box, the corpus's only **dive site whose locality is filled in** — a full name, a centre and a box on `location`, beside the site's own pin at a different point, which is the pair §6.10 exists to keep apart — an `agency: "other"` certification with `front_file`/`back_file` and an `aida` one, a value from the widening that closed §6.16's vocabulary, a dive-count service interval, three courses — a completed `"other"`-agency course linked from a dive and its certification, an unreferenced `"planned"` one with no dates, and one with **no `agency`**, the private-instructor case §6.17 leaves the member out for — a lowercase-`z`, one-digit-fraction `created_at` (both spellings the grammar allows and naive parsers reject), and a `bookmark` 85 s **past** `profile.duration` — the surface-marker case §6.4 blesses, which the pre-2026-09-04 validator rejected, and which also carries a `label` beside a `type`, the pairing §6.6 asks for on any value defined after 1.0. Its recording's device carries **all six** of §6.4b's members, hand-built like the rest of the file. Its diver carries an emergency contact, an insurance with a `number` and a `portrait_file`, the three members of §6.1 UDDF has no element for. It is also the **decompression** fixture: `mode: "open_circuit"` and a Bühlmann `deco_model` with a name and a 30/70 gradient-factor pair, the recording's five readouts, a `salinity` of `en13319` on a dive whose `water_type` is `salt` — the setting and the water being two facts (§6.4a) — and all six of §6.4's readout channels sampled on the depth channel's own times — an `ndl` that runs from the 99-minute display cap down to zero and back, a zero `ndl` at the same second as a `ceiling` (the coexistence §6.4 blesses), a `tts` present only while there is an obligation, a `ppo2` that climbs through three gases, a `cns` whose ends are the recording's own `cns_start` and `cns_end`, and a `surface_gradient_factor` above 100 with the `gradient_factor` beside it far below. Its profile's `extensions` carries a tissue-loading array, which is what §6.4c says tissue state rides until a reader can compute from it. |
 
 ## invalid/
 
@@ -58,8 +58,6 @@ validator does not look.
 | --- | --- | --- |
 | `bad-version.divejson` | `version` is `"0.9"` | §4, §7 |
 | `missing-format.divejson` | no `format` member | §4 |
-| `version-before-format.divejson` | `version` serialized before `format` | §4 |
-| `version-not-second.divejson` | `format` first but another member before `version` | §4 |
 | `null-member.divejson` | a member carried as `null` | §5.4 |
 | `undefined-member.divejson` | an undefined member outside `extensions` | §5.5 |
 | `duplicate-json-member.divejson` | the same JSON member name twice in one object | §9 |
@@ -67,8 +65,10 @@ validator does not look.
 | `dangling-reference.divejson` | a `site_uuids` entry resolves to nothing | §5.3 |
 | `duplicate-file-uuid-across-recordings.divejson` | two recordings of one dive carry the same stored-file record | §5.3 |
 | `duplicate-file-uuid-portrait.divejson` | the diver's `portrait_file` carries the uuid of a certification's `front_file` | §5.3 |
-| `recording-without-content.divejson` | a recording carrying none of `device`, `profile`, `source_files` | §3, §6.4a |
+| `recording-without-content.divejson` | a recording carrying none of `device`, `profile`, `source_files` and a readout | §3, §6.4a |
 | `dive-profile-outside-recording.divejson` | a `profile` on the dive rather than inside a recording — the retired shape | §6.2, §6.4a |
+| `dive-readout-outside-recording.divejson` | the surface pressure and the two oxygen clocks on the dive rather than on its recording — the retired shape | §6.2, §6.4a |
+| `water-type-en13319.divejson` | a dive's `water_type` of `"en13319"`, a calibration the recording's `salinity` holds rather than a kind of water | §6.2, §6.4a |
 | `device-empty-member.divejson` | a device with an empty `serial` | §6.4b |
 | `naive-exported-at.divejson` | `exported_at` without a UTC offset | §5.2 |
 | `trailing-newline-datetime.divejson` | a date-time with a trailing newline inside the string | §5.2 |
@@ -85,7 +85,7 @@ validator does not look.
 | `channel-length-mismatch.divejson` | a series' `times` and `values` differ in length | §6.5 |
 | `non-increasing-samples.divejson` | a series' `times` is not strictly increasing, **in a dive's second recording** | §6.5, §3 rule 3 |
 | `event-without-type-or-label.divejson` | an event with neither a `type` nor a `label` | §6.6 |
-| `deco-model-gf-order.divejson` | `gf_low > gf_high` on a recording's deco model | §3 rule 7, §6.4c |
+| `deco-model-gf-order.divejson` | `gf_low > gf_high` on a recording's deco model | §3 rule 6, §6.4c |
 | `trip-dates-reversed.divejson` | `ends_on` before `starts_on` on a trip part | §6.9a |
 | `course-dates-reversed.divejson` | `ends_on` before `starts_on` on a course | §6.17 |
 | `bbox-missing-corner.divejson` | a Bounding Box missing one corner | §6.9 |
@@ -162,14 +162,14 @@ format's document under [`docs/`](../docs).
 
 | file | modelled on | what it covers |
 | --- | --- | --- |
-| `subsurface.uddf` | Subsurface 6.0.x | The known answer for the channel arithmetic: eight of the 431 depth samples and two of the 29 temperatures of a real Subsurface export of the demo account, whose full 431 and 29 equal `valid/demo-logbook.divejson`'s after scaling, sample for sample. It also fails the 3.2.2 XSD, in the kinds the real export does — `mix(21/0)` ids carrying parentheses, a site id beginning with a digit, `<link ref>`s pointing at both, dive ids duplicating their own `<repetitiongroup>`'s, empty `<latitude/>`/`<longitude/>` and an empty `<divetrip/>` — plus the site id `" ff47210"`, whose leading space passes the schema and breaks a reference lookup that does not strip. Its second dive carries the six-point profile Subsurface fabricates for a dive that has none, and its first has a `profile.duration` of 4300 over a logged `duration` of 4010. |
+| `subsurface.uddf` | Subsurface 6.0.x | The known answer for the channel arithmetic: eight of the 431 depth samples and two of the 29 temperatures of a real Subsurface export of the demo account, whose full 431 and 29 equal `valid/demo-logbook.divejson`'s after scaling, sample for sample. It also fails the 3.2.2 XSD, in the kinds the real export does — `mix(21/0)` ids carrying parentheses, a site id beginning with a digit, `<link ref>`s pointing at both, dive ids duplicating their own `<repetitiongroup>`'s, empty `<latitude/>`/`<longitude/>` and an empty `<divetrip/>` — plus the site id `" ff47210"`, whose leading space passes the schema and breaks a reference lookup that does not strip. Its second dive carries the six-point profile Subsurface fabricates for a dive that has none, and its first has a profile spanning 4300 s over a logged `duration` of 4010. |
 | `divelogs.uddf` | divelogs.de | **No namespace at all**, so it fails the XSD at the root. `<tankdata>` sits before `<informationbeforedive>`, which no version of `diveType` permits — the converter takes children by name for the reason above it, that 3.2.1 and 3.2.2 disagree about the order and the namespace does not say which you have. Also `0.000000` coordinates on every site, a site with an empty `<name/>` and the dive whose link to it therefore resolves to nothing, zero-depth waypoints on every other sample, and its `<inifinity/>` misspelling of `<infinity>`. |
 | `shearwater-cloud.uddf` | Shearwater Cloud Desktop 2.12.10 | The generator table's only pair, and the export the rule in [`docs/uddf-mapping.md`](../docs/uddf-mapping.md) was written against: a `<datetime>` of `2026-09-08T15:18:10Z` read as a wall clock with **no offset**, reported `resolved`, because `<generator><name>` is the exact string `Shearwater Cloud Desktop` with the manufacturer id `Shearwater_Research_Inc` beside it — while the `Z` on `<generator><datetime>` is left alone. Its `/uddf/@version` is `3.2.3`. Its `<divecomputer>` is the full hardware block `opendiving.uddf`'s is not — a `<model>`, a `<serialnumber>` and a `<notes>` holding the firmware and log versions UDDF has no element for, which reach the gear item's notes and never the device's `firmware` — under an `id` of `Perdix 3_D9772626`, which is neither a `<kind>-<uuid>` nor an `NCName`, so both records take a derived uuid rather than one read back off it. Also four `<link>`s under `<informationbeforedive>` where a site is expected, none of which is one: the file's own calculated profile and a string nothing defines are dropped and reported, an empty `ref` passes without a finding, and the fourth — `ref="zhl16c"` — **resolves**, to the `<decomodel><buehlmann>` that gives this recording its `deco_model` of `buhlmann` with a 50/85 gradient-factor pair. It was the "not a site this converter carries" note until §6.4c existed. It is the generator table's other rule too: those gradient factors are whole percent because Shearwater Cloud Desktop wrote them, where the documentation says fraction. The recording's `mode` is `open_circuit` off the first waypoint's `<divemode>`, which the last four waypoints stop stating without that being a change, and the profile carries an `ndl` sitting on `5940` — the Perdix's 99-minute display maximum, a reading and not an absence — beside a `ppo2` read as bar rather than the documented Pascal and a three-sample `gradient_factor`. Its two `<tankdata>` blocks state both pressures as `0`, so each cylinder loses the start to §6.3's absent-marker and keeps the zero end pressure, and its `<switchmix>` at second 0 names a mix no `<tankdata>` links, kept as a gas switch that cannot say which cylinder it was to. |
 | `shearwater-cloud-cns.uddf` | Shearwater Cloud Desktop 2.12.10 | The **second** dive of the same day off the same Perdix 3, reduced the same way — the only file in hand with a per-sample `<cns>`, and the one that makes the `cns` channel a checked mapping rather than a written one. Sixteen of its 295 waypoints, chosen for what they carry: the CNS series climbing 1 % to 8 % (`10` to `80` in the channel's tenths), the `<nodecotime>` counting down from the display cap to 3 720 s and back, a `<gradientfactor>` spread of `0`, `1` and `4` through `17` where the first pair has only `0` and `1`, and a `<calculatedpo2>` from `0.34` to `0.96`. Six `<tankdata>` blocks with both pressures zero, where the other pair has two, so six cylinders arrive carrying an end pressure each and no start. Its dive links the same `<decomodel>` and carries the same 50/85 pair, which is the point: the model is the diver's setting and does not move between dives, while everything sampled does. |
 | `mix-only-cylinder.uddf` | hand-built | The shape §6.3 blesses and no real file on disk carried: a `<tankdata>` with a gas link, both pressures and a real drop between them, and **no `<tankvolume>`** — so a cylinder's size is the only input a gas-consumption figure lacks. Its second dive has no `<tankdata>` at all, which is what APD DiveSight exports. |
 | `owner-profile-only.uddf` | hand-built | An `<owner>` that records a person and names nobody: empty `<firstname/>` and `<lastname/>`, which `personalType` requires, and a `<birthdate>`. It reads to a diver carrying its uuid, off the `diver-<uuid>` id, and `born_on`, and nothing else: an owner is a diver whenever it records anything the reader maps, a name or not. |
 | `opendiving.uddf` | this format's reference writer | The richest mapping, and the round trip that matters most: `dive-<uuid>` style ids coming back as those uuids, trips with `<trippart>` dates and places, a kit list under `<equipment>` with per-dive `<equipmentused>` links, two cylinders on two gases, `<tankpressure>` channels, a `<switchmix>` gas switch and a `<setmarker>`. It is also a `<divecomputer>` read two ways at its thinnest: its `<name>Ocean</name>` becomes both the gear item's `name` and the device's, which is the shape the format produces far more often than the full hardware block `shearwater-cloud.uddf` carries — this element states no `<model>`, `<serialnumber>` or `<internaldivenumber>` at all. Its owner carries a `<birthdate>`, a `<contact><phone>` and one `<diveinsurances><insurance>` with a `<validdate>`, added by hand in the shape [`docs/uddf-writing.md`](../docs/uddf-writing.md) gives them: after the kit list for the insurance, before it for the contact, and both dates as a `<datetime>` at midnight. |
-| `legacy-writer.uddf` | 2.x writers | Four habits in one dive: an uppercase `<UDDF>` root with uppercase element *and attribute* names, `<o2>34</o2>` as whole percent, `<tankvolume>12</tankvolume>` as litres where UDDF specifies cubic metres, and the `<datetime>2002-06-18T</datetime>` a midnight dive gets from an unguarded string concatenation. Its waypoints are out of order, two of them round to the same second, and one has no `<divetime>` at all. |
+| `legacy-writer.uddf` | 2.x writers | Four habits in one dive: an uppercase `<UDDF>` root with uppercase element *and attribute* names, `<o2>34</o2>` as whole percent, `<tankvolume>12</tankvolume>` as litres where UDDF specifies cubic metres, and the `<datetime>2002-06-18T</datetime>` a midnight dive gets from an unguarded string concatenation, read as the date-only start it states. Its waypoints are out of order, two of them — `30` and `30.4` — share a second and not a millisecond, and one has no `<divetime>` at all. |
 
 ## ssrf/
 
@@ -200,7 +200,7 @@ reduced.
 
 | file | modelled on | what it covers |
 | --- | --- | --- |
-| `suunto-ocean.json` | Suunto Ocean, 2026 | The known answer, and the shape with no gas block: two cylinders from two gas switches where only one slot ever transmitted, `start_pressure` 211.625 bar and `end_pressure` 127.15625 bar against a pressure channel whose last value, 1273 tenths of a bar, is a reading the transmitter sent after the dive had ended, a `.510` sub-second fraction preserved on `started_at`, three entries merging onto second 0, a zero ceiling beside a real one, an entry position in degrees off `DiveRouteOrigin` and an exit in radians off a satellite fix — the same exit `fit/suunto-ocean.divejson` carries for this dive, from a different file through a different reader. |
+| `suunto-ocean.json` | Suunto Ocean, 2026 | The known answer, and the shape with no gas block: two cylinders from two gas switches where only one slot ever transmitted, `start_pressure` 211.625 bar and `end_pressure` 127.15625 bar against a pressure channel whose last value, 1273 tenths of a bar, is a reading the transmitter sent after the dive had ended, a `.510` sub-second fraction preserved on `started_at`, its first depth 160 ms after that instant and kept there, a zero ceiling beside a real one, an entry position in degrees off `DiveRouteOrigin` and an exit in radians off a satellite fix — the same exit `fit/suunto-ocean.divejson` carries for this dive, from a different file through a different reader. |
 | `suunto-ocean-2026.json` | Suunto Ocean, 2026 | The app's export of the dive `fit/suunto-ocean-2026.fit` is the computer's own, so the two carry different halves of one device: a `Device.Name` of `Porvoo` — the owner's name for the watch, which is what §6.4b's `name` holds and what this format has instead of a product name — beside the serial and the firmware the FIT file states nowhere. Also the Ocean shape with **no mixture anywhere**: five cylinder slots on every sample with only slot 0 transmitting, and a `GasSwitch` to gas 0, so the dive's one cylinder carries pressures, a gas number and no gas — absent means not recorded, never air. The `DiveTime` bound leaves `end_pressure` at 44.03125 bar while the pressure channel keeps the 45.0 bar the transmitter sent after that bound had passed; the entry position comes in degrees off `DiveRouteOrigin` and the exit in radians off a satellite fix; and `DiveTime`'s 3 051 s beats the longer `Duration` beside it to the dive's own `duration`, the in-water figure winning wherever the export states one. It is also the pair that holds the readout rules: five samples carry the `NoDecTime`/`TimeToSurface`/`RtGradientFactors` trio, and what comes out is an `ndl` of all five, a `tts` of **two** — the three zeros are the Ocean's absent-marker, not a time to surface of nothing from 14 and 19 m — a `gradient_factor` of **one**, the four `gf99: -100` samples being where no compartment leads, and a `surface_gradient_factor` of all five including its zeros. Four rules, one file. |
 | `purged-regulator.json` | Suunto Ocean, 2026 | The `DiveTime` bound where it is worth two thirds of a tank: an `end_pressure` of 53.34375 bar beside a pressure channel whose last value is 1 tenth of a bar, read six minutes after the diver got out. |
 | `suunto-d5.json` | Suunto D5, 2025 | The header's own gas block, in SI: two gases at 21 % and 49 % from cubic metres, Pascal and 0-1 fractions, the second carried and never transmitted from; telemetry on slot 1 resolving to cylinder 0; a switch to gas 2 resolving to cylinder 1; and the oxygen clock, `CNS` as a fraction beside `OTU` as itself. |
@@ -227,7 +227,7 @@ implementation.
 | --- | --- | --- |
 | `suunto-d5.xml` | Suunto D5, 2021 | The known answer: `max_depth` 32.41 and `started_at` `2021-04-06T11:16:42.6`, the fraction preserved and no offset supplied. **The same dive as `fit/suunto-d5.fit`**, recorded once and exported twice, which is what lets the two be read against each other through entirely different unit paths: on every second both documents sample, their depths are equal to the centimetre. They are not one grid, though — this reduction's last two samples, at 1 991 s and 2 001 s, have no counterpart in the FIT recording, whose own last sample is at 1 992 s. Also the untransmitted cylinder whose pressures are both the zero absent-marker, a single-gas switch at second 0, and the `<Marks>` block producing nothing. |
 | `nitrox-deco.xml` | Suunto D5, 2025 | Two cylinders and three elements that have to agree: a 21 % back gas with the pod on it, a 52 % deco bottle that never transmitted and so carries no pressures at all, a pressure channel labelled from `<TransmitterId>`, markers at 0 and 1 592 s taken from the `<DiveMixture>` each sits inside, and a real ceiling channel. |
-| `freedive.xml` | Suunto D5, 2023 | `<Mode>3</Mode>`: a **freedive**, and a dive. It converted to a conforming logbook with no dives at all until §6.4a gained `mode`; it now produces one dive whose recording says `freedive`, with no cylinder, no gas and no `deco_model` — a computer in freedive mode runs no decompression model, so its `<PersonalMode>` is the watch's setting rather than this dive's and is not carried. This is also the only pair where the same-second collision fires on a real file: five samples, three seconds, because a 1 s interval meets a `<Time>` that is not quite an integer — the collision every one of the corpus's 37 is, and unreachable while the reader stopped at `<Mode>` before it read a sample. |
+| `freedive.xml` | Suunto D5, 2023 | `<Mode>3</Mode>`: a **freedive**, and a dive. It converted to a conforming logbook with no dives at all until §6.4a gained `mode`; it now produces one dive whose recording says `freedive`, with no cylinder, no gas and no `deco_model` — a computer in freedive mode runs no decompression model, so its `<PersonalMode>` is the watch's setting rather than this dive's and is not carried. This is also the only pair where the sample-time collision fires on a real file: five samples, three sample times, the reduction repeating a whole-number `<Time>` of `1` that collides at any grain — one of the corpus's 37 on a whole-second axis, and unreachable while the reader stopped at `<Mode>` before it read a sample. |
 | `refusals.xml` | constructed | Everything this format's reader refuses that fits on one dive: a `<StartTime>` with no seconds, an average depth deeper than the maximum, a millibar surface pressure, a ppO₂ limit of 3.2 bar, a mix summing to 110 %, a gas change at -30 s, text in a `<Depth>`, a sample with a nil `<Time>`, two samples on one second, a tank reading past 350 bar, the dive-conditions block, and **two** cylinders claiming the transmitter. |
 | `unlabelled-pressure.xml` | constructed | Tank readings no cylinder claims, arriving as a cylinder of their own with nothing but the channel; beside them a zero `<MaxDepth>`, `<AvgDepth>` and `<Duration>`, a nil `<Mode>`, and a `<Note>` with whitespace around it. |
 
@@ -244,5 +244,5 @@ point of each row below is which part of `uddf-writing.md` it reaches.
 | file | written from | what it covers |
 | --- | --- | --- |
 | `opendiving.divejson` | `uddf/opendiving.divejson`, plus a device | The round trip that matters most, and the pair that exercises almost none of the report: this document is itself the *reading* of a UDDF export, so there is nothing in it UDDF cannot hold, and the only finding is the `extensions` exclusion every written file carries. `dive-<uuid>` ids that come back as those uuids, a trip of one part, written back as the `<trippart>` with its dates and its place that it was read from, a kit list under `<equipment>` with per-dive `<equipmentused>` links, two cylinders on two gases with their pressure channels, a `<switchmix>` gas switch and a `<setmarker>`. And the **fold**: its dive lists that `computer` gear item, which satisfies the predicate's link leg, and its recording's device and the gear item carry the same serial, so the serial leg fires and the two become one `<divecomputer>` element carrying both halves, with the device's counter on the dive as `<internaldivenumber>`. It is the corpus's only pair that reaches the serial leg. **No pair reaches the link leg refusing** — a `computer` gear item the document carries and one of its own dives does not link — so that branch has no pair either way, and [`docs/uddf-writing.md`](../docs/uddf-writing.md) writes it down rather than leaving it to the first writer to meet one. Its diver's `born_on`, `phone` and insurance are written to `<birthdate>`, `<contact><phone>` and `<diveinsurances>`, which puts a `<contact>` between `<personal>` and `<equipment>` and the insurances after the kit list, the order `personType` fixes. |
-| `technical-dive.divejson` | `valid/technical-dive.divejson` | Everything the first one cannot reach, being hand-built to hold what no UDDF export carries. The `dropped` half of the report: `courses`, `certifications`, `gear_sets`, gear service and `species`, which UDDF has no slot for; `role` and `usage` on a sidemount pair and its staged deco cylinders; a ceiling channel; a trip part's bounding box, and a dive site's locality entire but for its name — its full name, its centre and its box, which is three findings off one record where the part loses one; the gas numbering UDDF cannot record; `shears` landing in `<variouspieces>` and reading back as `other`; a trip part whose location has coordinates and no full name, which loses the coordinates rather than borrowing the name; a `bookmark` carrying a label, which keeps its type and loses the label; an event with a label and no type, which goes out as a `<setmarker>` carrying the label; the `deco_model`, `tts` and `surface_gradient_factor` its document now carries, each reported `dropped` — the first because UDDF's `<decomodel>` requires a tissue table this format has no member for, the other two because UDDF has no element at all; an empty note, which no UDDF file can spell; a device's `firmware`, for which `equipmentPieceType` has no element; and the diver's `emergency_contacts` and `portrait_file` and an insurance's `number`, which UDDF has no element for either — the insurance itself is written, as a `<diveinsurances>` entry carrying its provider. It is also the **other** half of the device fold: its gear list holds no computer, so the device matches nothing and gets a `<divecomputer>` of its own with a non-UUID id and a `<link>` from the dive — the one case where reading the written file back returns a gear item the input never had. That its device carries a `name` is what puts it inside that exception rather than beside it: a nameless device on an element of its own gets an empty `<name>`, which comes back as no gear item at all. The `absent` half is its second dive and its third trip part: no maximum depth, no duration and a cylinder with no start pressure, so `<greatestdepth>`, `<diveduration>` and `<tankpressurebegin>` are each written as the `0` a reader takes back off, and a part with no place gets the empty `<name>` `simpleNamedType` requires. Its trip is the corpus's only three-`<trippart>` one, and the three are the three shapes a part comes in: a place with dates, a place with none — which writes no `<dateoftrip>`, that being the one thing here that costs nothing — and dates with no place. |
+| `technical-dive.divejson` | `valid/technical-dive.divejson` | Everything the first one cannot reach, being hand-built to hold what no UDDF export carries. The `dropped` half of the report: `courses`, `certifications`, `gear_sets`, gear service and `species`, which UDDF has no slot for; `role` and `usage` on a sidemount pair and its staged deco cylinders; a ceiling channel; a trip part's bounding box, and a dive site's locality entire but for its name — its full name, its centre and its box, which is three findings off one record where the part loses one; the gas numbering UDDF cannot record; `shears` landing in `<variouspieces>` and reading back as `other`; a trip part whose location has coordinates and no full name, which loses the coordinates rather than borrowing the name; a `bookmark` carrying a label, which keeps its type and loses the label; an event with a label and no type, which goes out as a `<setmarker>` carrying the label; the `deco_model`, `tts` and `surface_gradient_factor` its document now carries, each reported `dropped` — the first because UDDF's `<decomodel>` requires a tissue table this format has no member for, the other two because UDDF has no element at all; an empty note, which no UDDF file can spell; a device's `firmware`, for which `equipmentPieceType` has no element; and the diver's `emergency_contacts` and `portrait_file` and an insurance's `number`, which UDDF has no element for either — the insurance itself is written, as a `<diveinsurances>` entry carrying its provider. It is also the **other** half of the device fold: its gear list holds no computer, so the device matches nothing and gets a `<divecomputer>` of its own with a non-UUID id and a `<link>` from the dive — the one case where reading the written file back returns a gear item the input never had. That its device carries a `name` is what puts it inside that exception rather than beside it: a nameless device on an element of its own gets an empty `<name>`, which comes back as no gear item at all. Its third dive starts on a date alone, the corpus's only such start going out, and is written as the bare `<datetime>` [`docs/uddf-writing.md`](../docs/uddf-writing.md) chooses over midnight; its recording's `salinity` and oxygen clocks are each reported `dropped`, while its surface pressure goes out as the dive's `<surfacepressure>`. The `absent` half is its second dive and its third trip part: no maximum depth, no duration and a cylinder with no start pressure, so `<greatestdepth>`, `<diveduration>` and `<tankpressurebegin>` are each written as the `0` a reader takes back off, and a part with no place gets the empty `<name>` `simpleNamedType` requires. Its trip is the corpus's only three-`<trippart>` one, and the three are the three shapes a part comes in: a place with dates, a place with none — which writes no `<dateoftrip>`, that being the one thing here that costs nothing — and dates with no place. |
 | `owner-profile-only.divejson` | `uddf/owner-profile-only.divejson` | The owner that records a person and names nobody, going out: a diver with a uuid and a `born_on` and no name or email still gets a `<diver>`, under `<owner id="diver-<uuid>">` because the document records something about the person, with the empty names `personalType` requires beside the `<birthdate>`. The written file is its reader pair's input again, `<generator>` aside. |
diff --git a/fixtures/invalid/agency-other-missing.divejson b/fixtures/invalid/agency-other-missing.divejson
index bea6749..a254415 100644
--- a/fixtures/invalid/agency-other-missing.divejson
+++ b/fixtures/invalid/agency-other-missing.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -98,21 +93,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -130,12 +130,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -149,8 +149,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -162,8 +162,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -175,8 +175,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -187,8 +187,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -198,8 +198,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -215,25 +215,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/avg-depth-exceeds-max.divejson b/fixtures/invalid/avg-depth-exceeds-max.divejson
index dd6f4b6..90545bc 100644
--- a/fixtures/invalid/avg-depth-exceeds-max.divejson
+++ b/fixtures/invalid/avg-depth-exceeds-max.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -98,21 +93,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -130,12 +130,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -149,8 +149,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -162,8 +162,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -175,8 +175,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -187,8 +187,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -198,8 +198,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -215,25 +215,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/bad-version.divejson b/fixtures/invalid/bad-version.divejson
index ac4d5f1..c207519 100644
--- a/fixtures/invalid/bad-version.divejson
+++ b/fixtures/invalid/bad-version.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -98,21 +93,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -130,12 +130,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -149,8 +149,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -162,8 +162,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -175,8 +175,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -187,8 +187,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -198,8 +198,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -215,25 +215,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/bbox-missing-corner.divejson b/fixtures/invalid/bbox-missing-corner.divejson
index d5853f6..4375e47 100644
--- a/fixtures/invalid/bbox-missing-corner.divejson
+++ b/fixtures/invalid/bbox-missing-corner.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -98,21 +93,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -130,12 +130,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -149,8 +149,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -162,8 +162,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -175,8 +175,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -187,8 +187,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -198,8 +198,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -215,25 +215,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/bbox-south-exceeds-north.divejson b/fixtures/invalid/bbox-south-exceeds-north.divejson
index 14d0fc0..1f8d710 100644
--- a/fixtures/invalid/bbox-south-exceeds-north.divejson
+++ b/fixtures/invalid/bbox-south-exceeds-north.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -98,21 +93,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -130,12 +130,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -149,8 +149,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -162,8 +162,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -175,8 +175,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -187,8 +187,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -198,8 +198,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -215,25 +215,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/bbox-without-position.divejson b/fixtures/invalid/bbox-without-position.divejson
index 7d2bc72..0d90a3c 100644
--- a/fixtures/invalid/bbox-without-position.divejson
+++ b/fixtures/invalid/bbox-without-position.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -98,21 +93,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -130,12 +130,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -149,8 +149,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -162,8 +162,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -175,8 +175,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -187,8 +187,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -198,8 +198,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -215,25 +215,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/channel-length-mismatch.divejson b/fixtures/invalid/channel-length-mismatch.divejson
index 3fdff28..21b6292 100644
--- a/fixtures/invalid/channel-length-mismatch.divejson
+++ b/fixtures/invalid/channel-length-mismatch.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -98,21 +93,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -130,12 +130,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -149,8 +149,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -163,8 +163,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -176,8 +176,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -188,8 +188,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -199,8 +199,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -216,25 +216,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/course-agency-other-without-agency.divejson b/fixtures/invalid/course-agency-other-without-agency.divejson
index 5c64175..5bac380 100644
--- a/fixtures/invalid/course-agency-other-without-agency.divejson
+++ b/fixtures/invalid/course-agency-other-without-agency.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -113,21 +108,26 @@
             "gf_low": 30,
             "gf_high": 70
           },
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -145,12 +145,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -164,8 +164,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -177,8 +177,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -190,8 +190,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -202,8 +202,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -213,8 +213,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -226,16 +226,16 @@
             "ndl": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 5940,
@@ -253,14 +253,14 @@
             },
             "tts": {
               "times": [
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000
               ],
               "values": [
                 900,
@@ -276,16 +276,16 @@
             "ppo2": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 18,
@@ -304,16 +304,16 @@
             "cns": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 45,
@@ -332,16 +332,16 @@
             "gradient_factor": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -360,16 +360,16 @@
             "surface_gradient_factor": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -392,29 +392,29 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               },
               {
-                "time": 5605,
+                "time": 5605000,
                 "type": "bookmark",
                 "label": "Surface marker"
               }
diff --git a/fixtures/invalid/course-dates-reversed.divejson b/fixtures/invalid/course-dates-reversed.divejson
index 997d662..13290c9 100644
--- a/fixtures/invalid/course-dates-reversed.divejson
+++ b/fixtures/invalid/course-dates-reversed.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -98,21 +93,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -130,12 +130,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -149,8 +149,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -162,8 +162,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -175,8 +175,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -187,8 +187,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -198,8 +198,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -215,25 +215,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/dangling-reference.divejson b/fixtures/invalid/dangling-reference.divejson
index 9e12759..082a272 100644
--- a/fixtures/invalid/dangling-reference.divejson
+++ b/fixtures/invalid/dangling-reference.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -58,7 +53,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -69,7 +64,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -80,7 +75,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -91,7 +86,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -99,21 +94,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -131,12 +131,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -150,8 +150,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -163,8 +163,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -176,8 +176,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -188,8 +188,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -199,8 +199,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -216,25 +216,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/deco-model-gf-order.divejson b/fixtures/invalid/deco-model-gf-order.divejson
index 0783dbf..5ef1509 100644
--- a/fixtures/invalid/deco-model-gf-order.divejson
+++ b/fixtures/invalid/deco-model-gf-order.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -105,21 +100,26 @@
             "gf_low": 70,
             "gf_high": 30
           },
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -137,12 +137,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -156,8 +156,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -169,8 +169,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -182,8 +182,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -194,8 +194,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -205,8 +205,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -222,25 +222,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/device-empty-member.divejson b/fixtures/invalid/device-empty-member.divejson
index 0ca4b58..2aacfec 100644
--- a/fixtures/invalid/device-empty-member.divejson
+++ b/fixtures/invalid/device-empty-member.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -106,21 +101,26 @@
             "name": "Deco",
             "dive_number": 87
           },
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -138,12 +138,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -157,8 +157,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -170,8 +170,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -183,8 +183,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -195,8 +195,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -206,8 +206,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -223,29 +223,29 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               },
               {
-                "time": 5605,
+                "time": 5605000,
                 "type": "bookmark",
                 "label": "Surface marker"
               }
diff --git a/fixtures/invalid/dive-profile-outside-recording.divejson b/fixtures/invalid/dive-profile-outside-recording.divejson
index 9c2cde1..8bdb18f 100644
--- a/fixtures/invalid/dive-profile-outside-recording.divejson
+++ b/fixtures/invalid/dive-profile-outside-recording.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -98,20 +93,20 @@
       ],
       "created_at": "2026-07-03T18:30:00+12:45",
       "profile": {
-        "duration": 5520,
+        "duration": 5520000,
         "depth": {
           "times": [
             0,
-            120,
-            600,
-            1500,
-            2400,
-            3000,
-            3600,
-            4200,
-            4800,
-            5400,
-            5520
+            120000,
+            600000,
+            1500000,
+            2400000,
+            3000000,
+            3600000,
+            4200000,
+            4800000,
+            5400000,
+            5520000
           ],
           "values": [
             0,
@@ -129,12 +124,12 @@
         },
         "ceiling": {
           "times": [
-            1500,
-            2400,
-            3000,
-            3600,
-            4200,
-            4800
+            1500000,
+            2400000,
+            3000000,
+            3600000,
+            4200000,
+            4800000
           ],
           "values": [
             1800,
@@ -148,8 +143,8 @@
         "temperature": {
           "times": [
             0,
-            1500,
-            5400
+            1500000,
+            5400000
           ],
           "values": [
             162,
@@ -161,8 +156,8 @@
           {
             "times": [
               0,
-              2400,
-              5400
+              2400000,
+              5400000
             ],
             "values": [
               2200,
@@ -174,8 +169,8 @@
           {
             "times": [
               0,
-              2400,
-              5400
+              2400000,
+              5400000
             ],
             "values": [
               2180,
@@ -186,8 +181,8 @@
           },
           {
             "times": [
-              3000,
-              4200
+              3000000,
+              4200000
             ],
             "values": [
               2000,
@@ -197,8 +192,8 @@
           },
           {
             "times": [
-              4200,
-              5400
+              4200000,
+              5400000
             ],
             "values": [
               1950,
@@ -214,29 +209,29 @@
             "gas_number": 1
           },
           {
-            "time": 2980,
+            "time": 2980000,
             "type": "deep_stop"
           },
           {
-            "time": 3005,
+            "time": 3005000,
             "type": "gas_switch",
             "gas_number": 3
           },
           {
-            "time": 4210,
+            "time": 4210000,
             "type": "gas_switch",
             "gas_number": 4
           },
           {
-            "time": 5100,
+            "time": 5100000,
             "type": "safety_stop"
           },
           {
-            "time": 5200,
+            "time": 5200000,
             "label": "Tissue ceiling cleared"
           },
           {
-            "time": 5605,
+            "time": 5605000,
             "type": "bookmark",
             "label": "Surface marker"
           }
diff --git a/fixtures/invalid/dive-readout-outside-recording.divejson b/fixtures/invalid/dive-readout-outside-recording.divejson
new file mode 100644
index 0000000..a3852d5
--- /dev/null
+++ b/fixtures/invalid/dive-readout-outside-recording.divejson
@@ -0,0 +1,703 @@
+{
+  "format": "divejson",
+  "version": "1.0",
+  "exported_at": "2026-08-28T12:00:00Z",
+  "generator": {
+    "name": "DiveJSON fixtures"
+  },
+  "diver": {
+    "uuid": "0198a6f0-1111-7001-8000-000000000001",
+    "name": "Alex Trim",
+    "emergency_contacts": [
+      {
+        "name": "Robin Trim",
+        "phone": "+64 3 555 0142",
+        "relationship": "brother"
+      }
+    ],
+    "insurances": [
+      {
+        "provider": "DAN World",
+        "number": "DW-88213"
+      }
+    ],
+    "portrait_file": {
+      "uuid": "0198a6f0-1111-7002-8000-000000000002",
+      "original_filename": "IMG_4471.jpg",
+      "content_type": "image/jpeg",
+      "byte_size": 2861904,
+      "sha256": "5e0c7a1b9d24f3e6a8b0c2d4e6f80a1b3c5d7e9f0a2b4c6d8e0f1a3b5c7d9e1f"
+    },
+    "created_at": "2024-01-05T09:00:00+00:00"
+  },
+  "dives": [
+    {
+      "uuid": "0198a6f0-1111-7010-8000-000000000010",
+      "number": 412,
+      "started_at": "2026-07-03T09:14:00+12:45",
+      "duration": 5520,
+      "notes": "Trimix wall dive; two deco gases staged on the line.",
+      "max_depth": 62.3,
+      "avg_depth": 31.8,
+      "bottom_temperature": 7.4,
+      "visibility": 25,
+      "weight": 0,
+      "water_type": "salt",
+      "altitude": 0,
+      "cns_start": 4.5,
+      "cns_end": 61.0,
+      "otu_start": 0,
+      "otu_end": 88.5,
+      "surface_pressure": 1.013,
+      "entry_position": {
+        "latitude": -45.86055,
+        "longitude": 170.66973
+      },
+      "exit_position": {
+        "latitude": -45.860632,
+        "longitude": 170.669841
+      },
+      "trip_uuid": "0198a6f0-1111-7030-8000-000000000030",
+      "course_uuid": "0198a6f0-1111-7090-8000-000000000090",
+      "site_uuids": [
+        "0198a6f0-1111-7040-8000-000000000040",
+        "0198a6f0-1111-7041-8000-000000000041"
+      ],
+      "gear_uuids": [
+        "0198a6f0-1111-7050-8000-000000000050",
+        "0198a6f0-1111-7051-8000-000000000051"
+      ],
+      "species_uuids": [
+        "0198a6f0-1111-7060-8000-000000000060"
+      ],
+      "cylinders": [
+        {
+          "volume": 12.0,
+          "start_pressure": 220.0,
+          "end_pressure": 80.0,
+          "oxygen": 18.0,
+          "helium": 45.0,
+          "ppo2_limit": 1.4,
+          "gas_number": 1,
+          "role": "bottom",
+          "usage": "parallel"
+        },
+        {
+          "volume": 12.0,
+          "start_pressure": 218.0,
+          "end_pressure": 95.0,
+          "oxygen": 18.0,
+          "helium": 45.0,
+          "ppo2_limit": 1.4,
+          "gas_number": 2,
+          "role": "bottom",
+          "usage": "parallel"
+        },
+        {
+          "volume": 7.0,
+          "start_pressure": 200.0,
+          "end_pressure": 120.0,
+          "oxygen": 50.0,
+          "helium": 0.0,
+          "ppo2_limit": 1.6,
+          "gas_number": 3,
+          "role": "deco",
+          "usage": "staged"
+        },
+        {
+          "volume": 7.0,
+          "start_pressure": 195.0,
+          "end_pressure": 0.0,
+          "oxygen": 100.0,
+          "helium": 0.0,
+          "ppo2_limit": 1.6,
+          "gas_number": 4,
+          "role": "oxygen",
+          "usage": "staged"
+        }
+      ],
+      "recordings": [
+        {
+          "device": {
+            "brand": "Shearwater",
+            "model": "Perdix 2",
+            "serial": "D9123456",
+            "firmware": "V92",
+            "name": "Deco",
+            "dive_number": 87
+          },
+          "mode": "open_circuit",
+          "deco_model": {
+            "algorithm": "buhlmann",
+            "name": "ZHL-16C",
+            "gf_low": 30,
+            "gf_high": 70
+          },
+          "salinity": "en13319",
+          "profile": {
+            "duration": 5520000,
+            "depth": {
+              "times": [
+                0,
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
+              ],
+              "values": [
+                0,
+                1830,
+                6100,
+                6230,
+                5800,
+                2100,
+                1200,
+                900,
+                600,
+                300,
+                0
+              ]
+            },
+            "ceiling": {
+              "times": [
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
+              ],
+              "values": [
+                1800,
+                1500,
+                900,
+                600,
+                300,
+                300
+              ]
+            },
+            "temperature": {
+              "times": [
+                0,
+                1500000,
+                5400000
+              ],
+              "values": [
+                162,
+                74,
+                158
+              ]
+            },
+            "pressures": [
+              {
+                "times": [
+                  0,
+                  2400000,
+                  5400000
+                ],
+                "values": [
+                  2200,
+                  1400,
+                  800
+                ],
+                "gas_number": 1
+              },
+              {
+                "times": [
+                  0,
+                  2400000,
+                  5400000
+                ],
+                "values": [
+                  2180,
+                  1500,
+                  950
+                ],
+                "gas_number": 2
+              },
+              {
+                "times": [
+                  3000000,
+                  4200000
+                ],
+                "values": [
+                  2000,
+                  1600
+                ],
+                "gas_number": 3
+              },
+              {
+                "times": [
+                  4200000,
+                  5400000
+                ],
+                "values": [
+                  1950,
+                  0
+                ],
+                "gas_number": 4
+              }
+            ],
+            "ndl": {
+              "times": [
+                0,
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
+              ],
+              "values": [
+                5940,
+                1200,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                1800,
+                5940
+              ]
+            },
+            "tts": {
+              "times": [
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000
+              ],
+              "values": [
+                900,
+                3900,
+                3300,
+                2400,
+                1500,
+                900,
+                420,
+                180
+              ]
+            },
+            "ppo2": {
+              "times": [
+                0,
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
+              ],
+              "values": [
+                18,
+                51,
+                128,
+                130,
+                122,
+                56,
+                110,
+                95,
+                160,
+                130,
+                100
+              ]
+            },
+            "cns": {
+              "times": [
+                0,
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
+              ],
+              "values": [
+                45,
+                50,
+                95,
+                210,
+                330,
+                360,
+                430,
+                480,
+                560,
+                600,
+                610
+              ]
+            },
+            "gradient_factor": {
+              "times": [
+                0,
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
+              ],
+              "values": [
+                0,
+                8,
+                22,
+                31,
+                38,
+                64,
+                68,
+                69,
+                67,
+                55,
+                41
+              ]
+            },
+            "surface_gradient_factor": {
+              "times": [
+                0,
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
+              ],
+              "values": [
+                0,
+                26,
+                88,
+                141,
+                158,
+                96,
+                84,
+                78,
+                72,
+                66,
+                41
+              ]
+            },
+            "events": [
+              {
+                "time": 0,
+                "type": "gas_switch",
+                "gas_number": 1
+              },
+              {
+                "time": 2980000,
+                "type": "deep_stop"
+              },
+              {
+                "time": 3005000,
+                "type": "gas_switch",
+                "gas_number": 3
+              },
+              {
+                "time": 4210000,
+                "type": "gas_switch",
+                "gas_number": 4
+              },
+              {
+                "time": 5100000,
+                "type": "safety_stop"
+              },
+              {
+                "time": 5200000,
+                "label": "Tissue ceiling cleared"
+              },
+              {
+                "time": 5605000,
+                "type": "bookmark",
+                "label": "Surface marker"
+              }
+            ],
+            "extensions": {
+              "com.example.deco": {
+                "tissue_loading_bar": [
+                  0.41,
+                  0.55,
+                  0.68,
+                  0.62
+                ]
+              }
+            }
+          }
+        }
+      ],
+      "created_at": "2026-07-03T18:30:00+12:45"
+    },
+    {
+      "uuid": "0198a6f0-1111-7011-8000-000000000011",
+      "started_at": "2026-07-04T10:02:00",
+      "site_uuids": [
+        "0198a6f0-1111-7040-8000-000000000040"
+      ],
+      "species_uuids": [
+        "0198a6f0-1111-7061-8000-000000000061"
+      ],
+      "cylinders": [
+        {
+          "oxygen": 32.0
+        }
+      ],
+      "notes": "Converted from a legacy log: no offset, no duration recorded."
+    }
+  ],
+  "trips": [
+    {
+      "uuid": "0198a6f0-1111-7030-8000-000000000030",
+      "name": "Fiordland tech week",
+      "parts": [
+        {
+          "starts_on": "2026-07-01",
+          "ends_on": "2026-07-04",
+          "location": {
+            "name": "Milford Sound",
+            "full_name": "Milford Sound / Piopiotahi, Southland, New Zealand",
+            "position": {
+              "latitude": -44.6414,
+              "longitude": 167.8974
+            },
+            "bbox": {
+              "south": -44.7,
+              "north": -44.58,
+              "west": 167.8,
+              "east": 167.99
+            }
+          }
+        },
+        {
+          "location": {
+            "name": "Chatham Rise crossing",
+            "position": {
+              "latitude": -43.9,
+              "longitude": 179.9
+            },
+            "bbox": {
+              "south": -44.2,
+              "north": -43.6,
+              "west": 179.5,
+              "east": -179.6
+            }
+          }
+        },
+        {
+          "starts_on": "2026-07-08",
+          "ends_on": "2026-07-09"
+        }
+      ],
+      "notes": "",
+      "created_at": "2026-06-01T08:00:00+12:00"
+    }
+  ],
+  "courses": [
+    {
+      "uuid": "0198a6f0-1111-7090-8000-000000000090",
+      "name": "Normoxic Trimix",
+      "agency": "other",
+      "agency_other": "NZ Tech Diving Society",
+      "status": "completed",
+      "starts_on": "2026-06-30",
+      "ends_on": "2026-07-05",
+      "instructor_name": "J. Harbord",
+      "training_center": "Deep South Divers",
+      "notes": "Four training dives; the wall dive was the final assessment.",
+      "created_at": "2026-06-01T09:00:00+12:00"
+    },
+    {
+      "uuid": "0198a6f0-1111-7091-8000-000000000091",
+      "name": "Cave 1",
+      "agency": "gue",
+      "status": "planned",
+      "notes": "Booked for the southern winter; no dates confirmed yet."
+    },
+    {
+      "uuid": "0198a6f0-1111-7092-8000-000000000092",
+      "name": "Underwater Videography",
+      "status": "completed",
+      "starts_on": "2026-08-14",
+      "ends_on": "2026-08-16",
+      "instructor_name": "T. Mahuta",
+      "notes": "Taught privately over two weekends; no agency issued it."
+    }
+  ],
+  "sites": [
+    {
+      "uuid": "0198a6f0-1111-7040-8000-000000000040",
+      "name": "Harrys Wall",
+      "location": {
+        "name": "Milford Sound, New Zealand",
+        "full_name": "Milford Sound / Piopiotahi, Southland, New Zealand",
+        "position": {
+          "latitude": -44.6414,
+          "longitude": 167.8974
+        },
+        "bbox": {
+          "south": -44.7,
+          "north": -44.58,
+          "west": 167.8,
+          "east": 167.99
+        }
+      },
+      "position": {
+        "latitude": -44.6301,
+        "longitude": 167.8901
+      },
+      "notes": "Black coral from 12 m.",
+      "created_at": "2026-06-01T08:05:00+12:00"
+    },
+    {
+      "uuid": "0198a6f0-1111-7041-8000-000000000041",
+      "name": "The Chimney"
+    }
+  ],
+  "species": [
+    {
+      "uuid": "0198a6f0-1111-7060-8000-000000000060",
+      "aphia_id": 103695,
+      "scientific_name": "Antipathella fiordensis",
+      "common_name": "Fiordland black coral",
+      "rank": "Species",
+      "created_at": "2026-07-03T19:00:00+12:45"
+    },
+    {
+      "uuid": "0198a6f0-1111-7061-8000-000000000061",
+      "common_name": "carpet shark"
+    }
+  ],
+  "gear": [
+    {
+      "uuid": "0198a6f0-1111-7050-8000-000000000050",
+      "name": "Twin 12 manifold",
+      "type": "cylinder",
+      "notes": "",
+      "rented": false,
+      "archived": false,
+      "dive_count": 84,
+      "created_at": "2024-02-01T10:00:00+00:00"
+    },
+    {
+      "uuid": "0198a6f0-1111-7051-8000-000000000051",
+      "name": "Tech drysuit",
+      "brand": "Santi",
+      "type": "drysuit",
+      "rented": false,
+      "dive_count": 122
+    },
+    {
+      "uuid": "0198a6f0-1111-7052-8000-000000000052",
+      "name": "EMT shears",
+      "type": "shears",
+      "rented": false,
+      "created_at": "2024-03-01T08:00:00.5z"
+    }
+  ],
+  "gear_sets": [
+    {
+      "uuid": "0198a6f0-1111-7055-8000-000000000055",
+      "name": "Cold water tech",
+      "weight": 4.0,
+      "gear_uuids": [
+        "0198a6f0-1111-7050-8000-000000000050",
+        "0198a6f0-1111-7051-8000-000000000051"
+      ],
+      "created_at": "2024-02-01T10:05:00+00:00"
+    }
+  ],
+  "gear_service_schedules": [
+    {
+      "uuid": "0198a6f0-1111-7070-8000-000000000070",
+      "gear_uuid": "0198a6f0-1111-7050-8000-000000000050",
+      "type": "visual_inspection",
+      "starts_on": "2024-02-01",
+      "interval_dives": 100,
+      "dive_count_at_start": 0,
+      "active": true,
+      "last_service_on": "2025-11-10",
+      "next_due_at_dive_count": 184,
+      "created_at": "2024-02-01T10:06:00+00:00"
+    }
+  ],
+  "gear_service_records": [
+    {
+      "uuid": "0198a6f0-1111-7071-8000-000000000071",
+      "gear_uuid": "0198a6f0-1111-7050-8000-000000000050",
+      "gear_service_schedule_uuid": "0198a6f0-1111-7070-8000-000000000070",
+      "type": "visual_inspection",
+      "serviced_on": "2025-11-10",
+      "dive_count_at_service": 84,
+      "performed_by": "Southern Cylinders Ltd",
+      "notes": "Passed.",
+      "created_at": "2025-11-10T15:00:00+13:00"
+    }
+  ],
+  "certifications": [
+    {
+      "uuid": "0198a6f0-1111-7080-8000-000000000080",
+      "agency": "other",
+      "agency_other": "NZ Tech Diving Society",
+      "name": "Normoxic Trimix Diver",
+      "number": "NZT-2044",
+      "certified_on": "2025-03-14",
+      "instructor_name": "J. Harbord",
+      "training_center": "Deep South Divers",
+      "course_uuid": "0198a6f0-1111-7090-8000-000000000090",
+      "notes": "",
+      "front_file": {
+        "uuid": "0198a6f0-1111-7081-8000-000000000081",
+        "original_filename": "trimix-card-front.jpg",
+        "content_type": "image/jpeg",
+        "byte_size": 240113,
+        "sha256": "a3f1c2d4e5b697887960a1b2c3d4e5f60718293a4b5c6d7e8f9012345678abcd"
+      },
+      "back_file": {
+        "uuid": "0198a6f0-1111-7082-8000-000000000082",
+        "original_filename": "trimix-card-back.jpg",
+        "content_type": "image/jpeg",
+        "byte_size": 199004,
+        "sha256": "b4f1c2d4e5b697887960a1b2c3d4e5f60718293a4b5c6d7e8f9012345678abce"
+      },
+      "created_at": "2025-03-15T09:00:00+13:00"
+    },
+    {
+      "uuid": "0198a6f0-1111-7083-8000-000000000083",
+      "agency": "aida",
+      "name": "AIDA 2 Freediver",
+      "certified_on": "2024-11-09"
+    }
+  ],
+  "extensions": {
+    "opendiving": {
+      "note": "hand-built conformance fixture"
+    }
+  }
+}
diff --git a/fixtures/invalid/diver-email-too-long.divejson b/fixtures/invalid/diver-email-too-long.divejson
index 7e541ff..0412211 100644
--- a/fixtures/invalid/diver-email-too-long.divejson
+++ b/fixtures/invalid/diver-email-too-long.divejson
@@ -38,11 +38,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -71,7 +66,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -82,7 +77,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -93,7 +88,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -104,7 +99,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -127,21 +122,26 @@
             "gf_low": 30,
             "gf_high": 70
           },
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -159,12 +159,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -178,8 +178,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -191,8 +191,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -204,8 +204,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -216,8 +216,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -227,8 +227,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -240,16 +240,16 @@
             "ndl": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 5940,
@@ -267,14 +267,14 @@
             },
             "tts": {
               "times": [
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000
               ],
               "values": [
                 900,
@@ -290,16 +290,16 @@
             "ppo2": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 18,
@@ -318,16 +318,16 @@
             "cns": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 45,
@@ -346,16 +346,16 @@
             "gradient_factor": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -374,16 +374,16 @@
             "surface_gradient_factor": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -406,29 +406,29 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               },
               {
-                "time": 5605,
+                "time": 5605000,
                 "type": "bookmark",
                 "label": "Surface marker"
               }
diff --git a/fixtures/invalid/diver-name-too-long.divejson b/fixtures/invalid/diver-name-too-long.divejson
index e548105..f651c87 100644
--- a/fixtures/invalid/diver-name-too-long.divejson
+++ b/fixtures/invalid/diver-name-too-long.divejson
@@ -37,11 +37,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -70,7 +65,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -81,7 +76,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -92,7 +87,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -103,7 +98,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -126,21 +121,26 @@
             "gf_low": 30,
             "gf_high": 70
           },
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -158,12 +158,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -177,8 +177,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -190,8 +190,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -203,8 +203,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -215,8 +215,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -226,8 +226,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -239,16 +239,16 @@
             "ndl": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 5940,
@@ -266,14 +266,14 @@
             },
             "tts": {
               "times": [
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000
               ],
               "values": [
                 900,
@@ -289,16 +289,16 @@
             "ppo2": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 18,
@@ -317,16 +317,16 @@
             "cns": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 45,
@@ -345,16 +345,16 @@
             "gradient_factor": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -373,16 +373,16 @@
             "surface_gradient_factor": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -405,29 +405,29 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               },
               {
-                "time": 5605,
+                "time": 5605000,
                 "type": "bookmark",
                 "label": "Surface marker"
               }
diff --git a/fixtures/invalid/diver-username-too-long.divejson b/fixtures/invalid/diver-username-too-long.divejson
index f6e84e3..f8affb0 100644
--- a/fixtures/invalid/diver-username-too-long.divejson
+++ b/fixtures/invalid/diver-username-too-long.divejson
@@ -38,11 +38,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -71,7 +66,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -82,7 +77,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -93,7 +88,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -104,7 +99,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -127,21 +122,26 @@
             "gf_low": 30,
             "gf_high": 70
           },
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -159,12 +159,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -178,8 +178,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -191,8 +191,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -204,8 +204,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -216,8 +216,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -227,8 +227,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -240,16 +240,16 @@
             "ndl": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 5940,
@@ -267,14 +267,14 @@
             },
             "tts": {
               "times": [
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000
               ],
               "values": [
                 900,
@@ -290,16 +290,16 @@
             "ppo2": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 18,
@@ -318,16 +318,16 @@
             "cns": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 45,
@@ -346,16 +346,16 @@
             "gradient_factor": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -374,16 +374,16 @@
             "surface_gradient_factor": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -406,29 +406,29 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               },
               {
-                "time": 5605,
+                "time": 5605000,
                 "type": "bookmark",
                 "label": "Surface marker"
               }
diff --git a/fixtures/invalid/duplicate-file-uuid-across-recordings.divejson b/fixtures/invalid/duplicate-file-uuid-across-recordings.divejson
index 2113f2e..93842ac 100644
--- a/fixtures/invalid/duplicate-file-uuid-across-recordings.divejson
+++ b/fixtures/invalid/duplicate-file-uuid-across-recordings.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -106,6 +101,11 @@
             "name": "Deco",
             "dive_number": 87
           },
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "source_files": [
             {
               "uuid": "0198a6f0-1111-7020-8000-000000000020",
@@ -116,20 +116,20 @@
             }
           ],
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -147,12 +147,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -166,8 +166,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -179,8 +179,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -192,8 +192,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -204,8 +204,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -215,8 +215,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -232,29 +232,29 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               },
               {
-                "time": 5605,
+                "time": 5605000,
                 "type": "bookmark",
                 "label": "Surface marker"
               }
diff --git a/fixtures/invalid/duplicate-file-uuid-portrait.divejson b/fixtures/invalid/duplicate-file-uuid-portrait.divejson
index c034988..b205deb 100644
--- a/fixtures/invalid/duplicate-file-uuid-portrait.divejson
+++ b/fixtures/invalid/duplicate-file-uuid-portrait.divejson
@@ -44,11 +44,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -77,7 +72,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -88,7 +83,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -99,7 +94,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -110,7 +105,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -133,21 +128,26 @@
             "gf_low": 30,
             "gf_high": 70
           },
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -165,12 +165,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -184,8 +184,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -197,8 +197,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -210,8 +210,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -222,8 +222,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -233,8 +233,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -246,16 +246,16 @@
             "ndl": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 5940,
@@ -273,14 +273,14 @@
             },
             "tts": {
               "times": [
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000
               ],
               "values": [
                 900,
@@ -296,16 +296,16 @@
             "ppo2": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 18,
@@ -324,16 +324,16 @@
             "cns": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 45,
@@ -352,16 +352,16 @@
             "gradient_factor": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -380,16 +380,16 @@
             "surface_gradient_factor": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -412,29 +412,29 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               },
               {
-                "time": 5605,
+                "time": 5605000,
                 "type": "bookmark",
                 "label": "Surface marker"
               }
diff --git a/fixtures/invalid/duplicate-uuid.divejson b/fixtures/invalid/duplicate-uuid.divejson
index b013874..a528884 100644
--- a/fixtures/invalid/duplicate-uuid.divejson
+++ b/fixtures/invalid/duplicate-uuid.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -98,21 +93,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -130,12 +130,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -149,8 +149,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -162,8 +162,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -175,8 +175,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -187,8 +187,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -198,8 +198,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -215,25 +215,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/emergency-contact-without-name.divejson b/fixtures/invalid/emergency-contact-without-name.divejson
index 4ce2633..2e6a23b 100644
--- a/fixtures/invalid/emergency-contact-without-name.divejson
+++ b/fixtures/invalid/emergency-contact-without-name.divejson
@@ -36,11 +36,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -69,7 +64,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -80,7 +75,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -91,7 +86,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -102,7 +97,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -125,21 +120,26 @@
             "gf_low": 30,
             "gf_high": 70
           },
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -157,12 +157,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -176,8 +176,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -189,8 +189,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -202,8 +202,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -214,8 +214,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -225,8 +225,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -238,16 +238,16 @@
             "ndl": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 5940,
@@ -265,14 +265,14 @@
             },
             "tts": {
               "times": [
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000
               ],
               "values": [
                 900,
@@ -288,16 +288,16 @@
             "ppo2": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 18,
@@ -316,16 +316,16 @@
             "cns": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 45,
@@ -344,16 +344,16 @@
             "gradient_factor": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -372,16 +372,16 @@
             "surface_gradient_factor": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -404,29 +404,29 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               },
               {
-                "time": 5605,
+                "time": 5605000,
                 "type": "bookmark",
                 "label": "Surface marker"
               }
diff --git a/fixtures/invalid/event-without-type-or-label.divejson b/fixtures/invalid/event-without-type-or-label.divejson
index c764f19..b704f4c 100644
--- a/fixtures/invalid/event-without-type-or-label.divejson
+++ b/fixtures/invalid/event-without-type-or-label.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -98,21 +93,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -130,12 +130,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -149,8 +149,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -162,8 +162,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -175,8 +175,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -187,8 +187,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -198,8 +198,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -215,25 +215,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200
+                "time": 5200000
               }
             ],
             "extensions": {
diff --git a/fixtures/invalid/insurance-without-provider.divejson b/fixtures/invalid/insurance-without-provider.divejson
index 0db6bf2..7e07619 100644
--- a/fixtures/invalid/insurance-without-provider.divejson
+++ b/fixtures/invalid/insurance-without-provider.divejson
@@ -36,11 +36,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -69,7 +64,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -80,7 +75,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -91,7 +86,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -102,7 +97,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -125,21 +120,26 @@
             "gf_low": 30,
             "gf_high": 70
           },
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -157,12 +157,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -176,8 +176,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -189,8 +189,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -202,8 +202,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -214,8 +214,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -225,8 +225,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -238,16 +238,16 @@
             "ndl": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 5940,
@@ -265,14 +265,14 @@
             },
             "tts": {
               "times": [
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000
               ],
               "values": [
                 900,
@@ -288,16 +288,16 @@
             "ppo2": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 18,
@@ -316,16 +316,16 @@
             "cns": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 45,
@@ -344,16 +344,16 @@
             "gradient_factor": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -372,16 +372,16 @@
             "surface_gradient_factor": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -404,29 +404,29 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               },
               {
-                "time": 5605,
+                "time": 5605000,
                 "type": "bookmark",
                 "label": "Surface marker"
               }
diff --git a/fixtures/invalid/missing-format.divejson b/fixtures/invalid/missing-format.divejson
index 2b067d1..93dffdb 100644
--- a/fixtures/invalid/missing-format.divejson
+++ b/fixtures/invalid/missing-format.divejson
@@ -23,11 +23,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -56,7 +51,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -67,7 +62,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -78,7 +73,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -89,7 +84,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -97,21 +92,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -129,12 +129,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -148,8 +148,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -161,8 +161,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -174,8 +174,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -186,8 +186,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -197,8 +197,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -214,25 +214,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/naive-exported-at.divejson b/fixtures/invalid/naive-exported-at.divejson
index 074c75a..c5704e7 100644
--- a/fixtures/invalid/naive-exported-at.divejson
+++ b/fixtures/invalid/naive-exported-at.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -98,21 +93,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -130,12 +130,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -149,8 +149,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -162,8 +162,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -175,8 +175,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -187,8 +187,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -198,8 +198,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -215,25 +215,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/non-increasing-samples.divejson b/fixtures/invalid/non-increasing-samples.divejson
index ac9f9a9..f0e993f 100644
--- a/fixtures/invalid/non-increasing-samples.divejson
+++ b/fixtures/invalid/non-increasing-samples.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -103,24 +98,29 @@
             "model": "Suunto Ocean",
             "serial": "000000000042",
             "name": "Porvoo"
-          }
+          },
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5
         },
         {
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                120,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                120000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -138,12 +138,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -157,8 +157,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -170,8 +170,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -183,8 +183,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -195,8 +195,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -206,8 +206,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -223,25 +223,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/null-member.divejson b/fixtures/invalid/null-member.divejson
index dac4ebe..01de754 100644
--- a/fixtures/invalid/null-member.divejson
+++ b/fixtures/invalid/null-member.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -98,21 +93,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -130,12 +130,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -149,8 +149,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -162,8 +162,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -175,8 +175,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -187,8 +187,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -198,8 +198,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -215,25 +215,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/oxygen-helium-sum.divejson b/fixtures/invalid/oxygen-helium-sum.divejson
index ba80d76..d951567 100644
--- a/fixtures/invalid/oxygen-helium-sum.divejson
+++ b/fixtures/invalid/oxygen-helium-sum.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 80.0,
           "helium": 30.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -98,21 +93,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -130,12 +130,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -149,8 +149,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -162,8 +162,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -175,8 +175,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -187,8 +187,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -198,8 +198,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -215,25 +215,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/position-incomplete.divejson b/fixtures/invalid/position-incomplete.divejson
index 2e3658f..75ddba1 100644
--- a/fixtures/invalid/position-incomplete.divejson
+++ b/fixtures/invalid/position-incomplete.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -56,7 +51,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -67,7 +62,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -78,7 +73,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -89,7 +84,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -97,21 +92,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -129,12 +129,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -148,8 +148,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -161,8 +161,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -174,8 +174,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -186,8 +186,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -197,8 +197,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -214,25 +214,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/pressure-order.divejson b/fixtures/invalid/pressure-order.divejson
index f72f717..2fc0ec7 100644
--- a/fixtures/invalid/pressure-order.divejson
+++ b/fixtures/invalid/pressure-order.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 210.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -98,21 +93,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -130,12 +130,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -149,8 +149,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -162,8 +162,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -175,8 +175,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -187,8 +187,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -198,8 +198,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -215,25 +215,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/profile-duration-short.divejson b/fixtures/invalid/profile-duration-short.divejson
index c0ba36c..ffc963d 100644
--- a/fixtures/invalid/profile-duration-short.divejson
+++ b/fixtures/invalid/profile-duration-short.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -98,21 +93,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 100,
+            "duration": 100000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -130,12 +130,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -149,8 +149,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -162,8 +162,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -175,8 +175,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -187,8 +187,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -198,8 +198,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -215,25 +215,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/recording-without-content.divejson b/fixtures/invalid/recording-without-content.divejson
index a393f86..5ed274d 100644
--- a/fixtures/invalid/recording-without-content.divejson
+++ b/fixtures/invalid/recording-without-content.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -106,21 +101,26 @@
             "name": "Deco",
             "dive_number": 87
           },
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -138,12 +138,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -157,8 +157,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -170,8 +170,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -183,8 +183,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -195,8 +195,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -206,8 +206,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -223,29 +223,29 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               },
               {
-                "time": 5605,
+                "time": 5605000,
                 "type": "bookmark",
                 "label": "Surface marker"
               }
diff --git a/fixtures/invalid/site-bbox-south-exceeds-north.divejson b/fixtures/invalid/site-bbox-south-exceeds-north.divejson
index 1702f96..c6fba51 100644
--- a/fixtures/invalid/site-bbox-south-exceeds-north.divejson
+++ b/fixtures/invalid/site-bbox-south-exceeds-north.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -98,21 +93,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -130,12 +130,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -149,8 +149,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -162,8 +162,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -175,8 +175,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -187,8 +187,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -198,8 +198,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -215,25 +215,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/species-no-identity.divejson b/fixtures/invalid/species-no-identity.divejson
index e035cb3..5a8cfd7 100644
--- a/fixtures/invalid/species-no-identity.divejson
+++ b/fixtures/invalid/species-no-identity.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -98,21 +93,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -130,12 +130,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -149,8 +149,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -162,8 +162,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -175,8 +175,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -187,8 +187,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -198,8 +198,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -215,25 +215,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/trailing-newline-datetime.divejson b/fixtures/invalid/trailing-newline-datetime.divejson
index cc1b22a..5995c0b 100644
--- a/fixtures/invalid/trailing-newline-datetime.divejson
+++ b/fixtures/invalid/trailing-newline-datetime.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -98,21 +93,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -130,12 +130,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -149,8 +149,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -162,8 +162,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -175,8 +175,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -187,8 +187,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -198,8 +198,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -215,25 +215,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/trip-dates-reversed.divejson b/fixtures/invalid/trip-dates-reversed.divejson
index fb1b58d..f704125 100644
--- a/fixtures/invalid/trip-dates-reversed.divejson
+++ b/fixtures/invalid/trip-dates-reversed.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -98,21 +93,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -130,12 +130,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -149,8 +149,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -162,8 +162,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -175,8 +175,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -187,8 +187,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -198,8 +198,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -215,25 +215,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/undefined-member.divejson b/fixtures/invalid/undefined-member.divejson
index 1a470cc..3355bb0 100644
--- a/fixtures/invalid/undefined-member.divejson
+++ b/fixtures/invalid/undefined-member.divejson
@@ -24,11 +24,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -57,7 +52,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -68,7 +63,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -79,7 +74,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -90,7 +85,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -98,21 +93,26 @@
       ],
       "recordings": [
         {
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -130,12 +130,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -149,8 +149,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -162,8 +162,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -175,8 +175,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -187,8 +187,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -198,8 +198,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -215,25 +215,25 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               }
             ],
diff --git a/fixtures/invalid/version-before-format.divejson b/fixtures/invalid/version-before-format.divejson
deleted file mode 100644
index 52f1162..0000000
--- a/fixtures/invalid/version-before-format.divejson
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "version": "1.0",
-  "format": "divejson",
-  "exported_at": "2026-08-28T12:00:00+00:00"
-}
diff --git a/fixtures/invalid/version-not-second.divejson b/fixtures/invalid/version-not-second.divejson
deleted file mode 100644
index 5a2a80e..0000000
--- a/fixtures/invalid/version-not-second.divejson
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "format": "divejson",
-  "exported_at": "2026-08-28T12:00:00+00:00",
-  "version": "1.0"
-}
diff --git a/fixtures/invalid/water-type-en13319.divejson b/fixtures/invalid/water-type-en13319.divejson
new file mode 100644
index 0000000..ba1014d
--- /dev/null
+++ b/fixtures/invalid/water-type-en13319.divejson
@@ -0,0 +1,703 @@
+{
+  "format": "divejson",
+  "version": "1.0",
+  "exported_at": "2026-08-28T12:00:00Z",
+  "generator": {
+    "name": "DiveJSON fixtures"
+  },
+  "diver": {
+    "uuid": "0198a6f0-1111-7001-8000-000000000001",
+    "name": "Alex Trim",
+    "emergency_contacts": [
+      {
+        "name": "Robin Trim",
+        "phone": "+64 3 555 0142",
+        "relationship": "brother"
+      }
+    ],
+    "insurances": [
+      {
+        "provider": "DAN World",
+        "number": "DW-88213"
+      }
+    ],
+    "portrait_file": {
+      "uuid": "0198a6f0-1111-7002-8000-000000000002",
+      "original_filename": "IMG_4471.jpg",
+      "content_type": "image/jpeg",
+      "byte_size": 2861904,
+      "sha256": "5e0c7a1b9d24f3e6a8b0c2d4e6f80a1b3c5d7e9f0a2b4c6d8e0f1a3b5c7d9e1f"
+    },
+    "created_at": "2024-01-05T09:00:00+00:00"
+  },
+  "dives": [
+    {
+      "uuid": "0198a6f0-1111-7010-8000-000000000010",
+      "number": 412,
+      "started_at": "2026-07-03T09:14:00+12:45",
+      "duration": 5520,
+      "notes": "Trimix wall dive; two deco gases staged on the line.",
+      "max_depth": 62.3,
+      "avg_depth": 31.8,
+      "bottom_temperature": 7.4,
+      "visibility": 25,
+      "weight": 0,
+      "water_type": "en13319",
+      "altitude": 0,
+      "entry_position": {
+        "latitude": -45.86055,
+        "longitude": 170.66973
+      },
+      "exit_position": {
+        "latitude": -45.860632,
+        "longitude": 170.669841
+      },
+      "trip_uuid": "0198a6f0-1111-7030-8000-000000000030",
+      "course_uuid": "0198a6f0-1111-7090-8000-000000000090",
+      "site_uuids": [
+        "0198a6f0-1111-7040-8000-000000000040",
+        "0198a6f0-1111-7041-8000-000000000041"
+      ],
+      "gear_uuids": [
+        "0198a6f0-1111-7050-8000-000000000050",
+        "0198a6f0-1111-7051-8000-000000000051"
+      ],
+      "species_uuids": [
+        "0198a6f0-1111-7060-8000-000000000060"
+      ],
+      "cylinders": [
+        {
+          "volume": 12.0,
+          "start_pressure": 220.0,
+          "end_pressure": 80.0,
+          "oxygen": 18.0,
+          "helium": 45.0,
+          "ppo2_limit": 1.4,
+          "gas_number": 1,
+          "role": "bottom",
+          "usage": "parallel"
+        },
+        {
+          "volume": 12.0,
+          "start_pressure": 218.0,
+          "end_pressure": 95.0,
+          "oxygen": 18.0,
+          "helium": 45.0,
+          "ppo2_limit": 1.4,
+          "gas_number": 2,
+          "role": "bottom",
+          "usage": "parallel"
+        },
+        {
+          "volume": 7.0,
+          "start_pressure": 200.0,
+          "end_pressure": 120.0,
+          "oxygen": 50.0,
+          "helium": 0.0,
+          "ppo2_limit": 1.6,
+          "gas_number": 3,
+          "role": "deco",
+          "usage": "staged"
+        },
+        {
+          "volume": 7.0,
+          "start_pressure": 195.0,
+          "end_pressure": 0.0,
+          "oxygen": 100.0,
+          "helium": 0.0,
+          "ppo2_limit": 1.6,
+          "gas_number": 4,
+          "role": "oxygen",
+          "usage": "staged"
+        }
+      ],
+      "recordings": [
+        {
+          "device": {
+            "brand": "Shearwater",
+            "model": "Perdix 2",
+            "serial": "D9123456",
+            "firmware": "V92",
+            "name": "Deco",
+            "dive_number": 87
+          },
+          "mode": "open_circuit",
+          "deco_model": {
+            "algorithm": "buhlmann",
+            "name": "ZHL-16C",
+            "gf_low": 30,
+            "gf_high": 70
+          },
+          "salinity": "en13319",
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
+          "profile": {
+            "duration": 5520000,
+            "depth": {
+              "times": [
+                0,
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
+              ],
+              "values": [
+                0,
+                1830,
+                6100,
+                6230,
+                5800,
+                2100,
+                1200,
+                900,
+                600,
+                300,
+                0
+              ]
+            },
+            "ceiling": {
+              "times": [
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
+              ],
+              "values": [
+                1800,
+                1500,
+                900,
+                600,
+                300,
+                300
+              ]
+            },
+            "temperature": {
+              "times": [
+                0,
+                1500000,
+                5400000
+              ],
+              "values": [
+                162,
+                74,
+                158
+              ]
+            },
+            "pressures": [
+              {
+                "times": [
+                  0,
+                  2400000,
+                  5400000
+                ],
+                "values": [
+                  2200,
+                  1400,
+                  800
+                ],
+                "gas_number": 1
+              },
+              {
+                "times": [
+                  0,
+                  2400000,
+                  5400000
+                ],
+                "values": [
+                  2180,
+                  1500,
+                  950
+                ],
+                "gas_number": 2
+              },
+              {
+                "times": [
+                  3000000,
+                  4200000
+                ],
+                "values": [
+                  2000,
+                  1600
+                ],
+                "gas_number": 3
+              },
+              {
+                "times": [
+                  4200000,
+                  5400000
+                ],
+                "values": [
+                  1950,
+                  0
+                ],
+                "gas_number": 4
+              }
+            ],
+            "ndl": {
+              "times": [
+                0,
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
+              ],
+              "values": [
+                5940,
+                1200,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                1800,
+                5940
+              ]
+            },
+            "tts": {
+              "times": [
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000
+              ],
+              "values": [
+                900,
+                3900,
+                3300,
+                2400,
+                1500,
+                900,
+                420,
+                180
+              ]
+            },
+            "ppo2": {
+              "times": [
+                0,
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
+              ],
+              "values": [
+                18,
+                51,
+                128,
+                130,
+                122,
+                56,
+                110,
+                95,
+                160,
+                130,
+                100
+              ]
+            },
+            "cns": {
+              "times": [
+                0,
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
+              ],
+              "values": [
+                45,
+                50,
+                95,
+                210,
+                330,
+                360,
+                430,
+                480,
+                560,
+                600,
+                610
+              ]
+            },
+            "gradient_factor": {
+              "times": [
+                0,
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
+              ],
+              "values": [
+                0,
+                8,
+                22,
+                31,
+                38,
+                64,
+                68,
+                69,
+                67,
+                55,
+                41
+              ]
+            },
+            "surface_gradient_factor": {
+              "times": [
+                0,
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
+              ],
+              "values": [
+                0,
+                26,
+                88,
+                141,
+                158,
+                96,
+                84,
+                78,
+                72,
+                66,
+                41
+              ]
+            },
+            "events": [
+              {
+                "time": 0,
+                "type": "gas_switch",
+                "gas_number": 1
+              },
+              {
+                "time": 2980000,
+                "type": "deep_stop"
+              },
+              {
+                "time": 3005000,
+                "type": "gas_switch",
+                "gas_number": 3
+              },
+              {
+                "time": 4210000,
+                "type": "gas_switch",
+                "gas_number": 4
+              },
+              {
+                "time": 5100000,
+                "type": "safety_stop"
+              },
+              {
+                "time": 5200000,
+                "label": "Tissue ceiling cleared"
+              },
+              {
+                "time": 5605000,
+                "type": "bookmark",
+                "label": "Surface marker"
+              }
+            ],
+            "extensions": {
+              "com.example.deco": {
+                "tissue_loading_bar": [
+                  0.41,
+                  0.55,
+                  0.68,
+                  0.62
+                ]
+              }
+            }
+          }
+        }
+      ],
+      "created_at": "2026-07-03T18:30:00+12:45"
+    },
+    {
+      "uuid": "0198a6f0-1111-7011-8000-000000000011",
+      "started_at": "2026-07-04T10:02:00",
+      "site_uuids": [
+        "0198a6f0-1111-7040-8000-000000000040"
+      ],
+      "species_uuids": [
+        "0198a6f0-1111-7061-8000-000000000061"
+      ],
+      "cylinders": [
+        {
+          "oxygen": 32.0
+        }
+      ],
+      "notes": "Converted from a legacy log: no offset, no duration recorded."
+    }
+  ],
+  "trips": [
+    {
+      "uuid": "0198a6f0-1111-7030-8000-000000000030",
+      "name": "Fiordland tech week",
+      "parts": [
+        {
+          "starts_on": "2026-07-01",
+          "ends_on": "2026-07-04",
+          "location": {
+            "name": "Milford Sound",
+            "full_name": "Milford Sound / Piopiotahi, Southland, New Zealand",
+            "position": {
+              "latitude": -44.6414,
+              "longitude": 167.8974
+            },
+            "bbox": {
+              "south": -44.7,
+              "north": -44.58,
+              "west": 167.8,
+              "east": 167.99
+            }
+          }
+        },
+        {
+          "location": {
+            "name": "Chatham Rise crossing",
+            "position": {
+              "latitude": -43.9,
+              "longitude": 179.9
+            },
+            "bbox": {
+              "south": -44.2,
+              "north": -43.6,
+              "west": 179.5,
+              "east": -179.6
+            }
+          }
+        },
+        {
+          "starts_on": "2026-07-08",
+          "ends_on": "2026-07-09"
+        }
+      ],
+      "notes": "",
+      "created_at": "2026-06-01T08:00:00+12:00"
+    }
+  ],
+  "courses": [
+    {
+      "uuid": "0198a6f0-1111-7090-8000-000000000090",
+      "name": "Normoxic Trimix",
+      "agency": "other",
+      "agency_other": "NZ Tech Diving Society",
+      "status": "completed",
+      "starts_on": "2026-06-30",
+      "ends_on": "2026-07-05",
+      "instructor_name": "J. Harbord",
+      "training_center": "Deep South Divers",
+      "notes": "Four training dives; the wall dive was the final assessment.",
+      "created_at": "2026-06-01T09:00:00+12:00"
+    },
+    {
+      "uuid": "0198a6f0-1111-7091-8000-000000000091",
+      "name": "Cave 1",
+      "agency": "gue",
+      "status": "planned",
+      "notes": "Booked for the southern winter; no dates confirmed yet."
+    },
+    {
+      "uuid": "0198a6f0-1111-7092-8000-000000000092",
+      "name": "Underwater Videography",
+      "status": "completed",
+      "starts_on": "2026-08-14",
+      "ends_on": "2026-08-16",
+      "instructor_name": "T. Mahuta",
+      "notes": "Taught privately over two weekends; no agency issued it."
+    }
+  ],
+  "sites": [
+    {
+      "uuid": "0198a6f0-1111-7040-8000-000000000040",
+      "name": "Harrys Wall",
+      "location": {
+        "name": "Milford Sound, New Zealand",
+        "full_name": "Milford Sound / Piopiotahi, Southland, New Zealand",
+        "position": {
+          "latitude": -44.6414,
+          "longitude": 167.8974
+        },
+        "bbox": {
+          "south": -44.7,
+          "north": -44.58,
+          "west": 167.8,
+          "east": 167.99
+        }
+      },
+      "position": {
+        "latitude": -44.6301,
+        "longitude": 167.8901
+      },
+      "notes": "Black coral from 12 m.",
+      "created_at": "2026-06-01T08:05:00+12:00"
+    },
+    {
+      "uuid": "0198a6f0-1111-7041-8000-000000000041",
+      "name": "The Chimney"
+    }
+  ],
+  "species": [
+    {
+      "uuid": "0198a6f0-1111-7060-8000-000000000060",
+      "aphia_id": 103695,
+      "scientific_name": "Antipathella fiordensis",
+      "common_name": "Fiordland black coral",
+      "rank": "Species",
+      "created_at": "2026-07-03T19:00:00+12:45"
+    },
+    {
+      "uuid": "0198a6f0-1111-7061-8000-000000000061",
+      "common_name": "carpet shark"
+    }
+  ],
+  "gear": [
+    {
+      "uuid": "0198a6f0-1111-7050-8000-000000000050",
+      "name": "Twin 12 manifold",
+      "type": "cylinder",
+      "notes": "",
+      "rented": false,
+      "archived": false,
+      "dive_count": 84,
+      "created_at": "2024-02-01T10:00:00+00:00"
+    },
+    {
+      "uuid": "0198a6f0-1111-7051-8000-000000000051",
+      "name": "Tech drysuit",
+      "brand": "Santi",
+      "type": "drysuit",
+      "rented": false,
+      "dive_count": 122
+    },
+    {
+      "uuid": "0198a6f0-1111-7052-8000-000000000052",
+      "name": "EMT shears",
+      "type": "shears",
+      "rented": false,
+      "created_at": "2024-03-01T08:00:00.5z"
+    }
+  ],
+  "gear_sets": [
+    {
+      "uuid": "0198a6f0-1111-7055-8000-000000000055",
+      "name": "Cold water tech",
+      "weight": 4.0,
+      "gear_uuids": [
+        "0198a6f0-1111-7050-8000-000000000050",
+        "0198a6f0-1111-7051-8000-000000000051"
+      ],
+      "created_at": "2024-02-01T10:05:00+00:00"
+    }
+  ],
+  "gear_service_schedules": [
+    {
+      "uuid": "0198a6f0-1111-7070-8000-000000000070",
+      "gear_uuid": "0198a6f0-1111-7050-8000-000000000050",
+      "type": "visual_inspection",
+      "starts_on": "2024-02-01",
+      "interval_dives": 100,
+      "dive_count_at_start": 0,
+      "active": true,
+      "last_service_on": "2025-11-10",
+      "next_due_at_dive_count": 184,
+      "created_at": "2024-02-01T10:06:00+00:00"
+    }
+  ],
+  "gear_service_records": [
+    {
+      "uuid": "0198a6f0-1111-7071-8000-000000000071",
+      "gear_uuid": "0198a6f0-1111-7050-8000-000000000050",
+      "gear_service_schedule_uuid": "0198a6f0-1111-7070-8000-000000000070",
+      "type": "visual_inspection",
+      "serviced_on": "2025-11-10",
+      "dive_count_at_service": 84,
+      "performed_by": "Southern Cylinders Ltd",
+      "notes": "Passed.",
+      "created_at": "2025-11-10T15:00:00+13:00"
+    }
+  ],
+  "certifications": [
+    {
+      "uuid": "0198a6f0-1111-7080-8000-000000000080",
+      "agency": "other",
+      "agency_other": "NZ Tech Diving Society",
+      "name": "Normoxic Trimix Diver",
+      "number": "NZT-2044",
+      "certified_on": "2025-03-14",
+      "instructor_name": "J. Harbord",
+      "training_center": "Deep South Divers",
+      "course_uuid": "0198a6f0-1111-7090-8000-000000000090",
+      "notes": "",
+      "front_file": {
+        "uuid": "0198a6f0-1111-7081-8000-000000000081",
+        "original_filename": "trimix-card-front.jpg",
+        "content_type": "image/jpeg",
+        "byte_size": 240113,
+        "sha256": "a3f1c2d4e5b697887960a1b2c3d4e5f60718293a4b5c6d7e8f9012345678abcd"
+      },
+      "back_file": {
+        "uuid": "0198a6f0-1111-7082-8000-000000000082",
+        "original_filename": "trimix-card-back.jpg",
+        "content_type": "image/jpeg",
+        "byte_size": 199004,
+        "sha256": "b4f1c2d4e5b697887960a1b2c3d4e5f60718293a4b5c6d7e8f9012345678abce"
+      },
+      "created_at": "2025-03-15T09:00:00+13:00"
+    },
+    {
+      "uuid": "0198a6f0-1111-7083-8000-000000000083",
+      "agency": "aida",
+      "name": "AIDA 2 Freediver",
+      "certified_on": "2024-11-09"
+    }
+  ],
+  "extensions": {
+    "opendiving": {
+      "note": "hand-built conformance fixture"
+    }
+  }
+}
diff --git a/fixtures/valid/demo-logbook.divejson b/fixtures/valid/demo-logbook.divejson
index e091594..53eb82e 100644
--- a/fixtures/valid/demo-logbook.divejson
+++ b/fixtures/valid/demo-logbook.divejson
@@ -69,440 +69,440 @@
             }
           ],
           "profile": {
-            "duration": 4301,
+            "duration": 4301000,
             "depth": {
               "times": [
                 0,
-                10,
-                20,
-                30,
-                40,
-                50,
-                60,
-                70,
-                80,
-                90,
-                100,
-                110,
-                120,
-                130,
-                140,
-                150,
-                160,
-                170,
-                180,
-                190,
-                200,
-                210,
-                220,
-                230,
-                240,
-                250,
-                260,
-                270,
-                280,
-                290,
-                300,
-                310,
-                320,
-                330,
-                340,
-                350,
-                360,
-                370,
-                380,
-                390,
-                400,
-                410,
-                420,
-                430,
-                440,
-                450,
-                460,
-                470,
-                480,
-                490,
-                500,
-                510,
-                520,
-                530,
-                540,
-                550,
-                560,
-                570,
-                580,
-                590,
-                600,
-                610,
-                620,
-                630,
-                640,
-                650,
-                660,
-                670,
-                680,
-                690,
-                700,
-                710,
-                720,
-                730,
-                740,
-                750,
-                760,
-                770,
-                780,
-                790,
-                800,
-                810,
-                820,
-                830,
-                840,
-                850,
-                860,
-                870,
-                880,
-                890,
-                900,
-                910,
-                920,
-                930,
-                940,
-                950,
-                960,
-                970,
-                980,
-                990,
-                1000,
-                1010,
-                1020,
-                1030,
-                1040,
-                1050,
-                1060,
-                1070,
-                1080,
-                1090,
-                1100,
-                1110,
-                1120,
-                1130,
-                1140,
-                1150,
-                1160,
-                1170,
-                1180,
-                1190,
-                1200,
-                1210,
-                1220,
-                1230,
-                1240,
-                1250,
-                1260,
-                1270,
-                1280,
-                1290,
-                1300,
-                1310,
-                1320,
-                1330,
-                1340,
-                1350,
-                1360,
-                1370,
-                1380,
-                1390,
-                1400,
-                1410,
-                1420,
-                1430,
-                1440,
-                1450,
-                1460,
-                1470,
-                1480,
-                1490,
-                1500,
-                1510,
-                1520,
-                1530,
-                1540,
-                1550,
-                1560,
-                1570,
-                1580,
-                1590,
-                1600,
-                1610,
-                1620,
-                1630,
-                1640,
-                1650,
-                1660,
-                1670,
-                1680,
-                1690,
-                1700,
-                1710,
-                1720,
-                1730,
-                1740,
-                1750,
-                1760,
-                1770,
-                1780,
-                1790,
-                1800,
-                1810,
-                1820,
-                1830,
-                1840,
-                1850,
-                1860,
-                1870,
-                1880,
-                1890,
-                1900,
-                1910,
-                1920,
-                1930,
-                1940,
-                1950,
-                1960,
-                1970,
-                1980,
-                1990,
-                2000,
-                2010,
-                2020,
-                2030,
-                2040,
-                2050,
-                2060,
-                2070,
-                2080,
-                2090,
-                2100,
-                2110,
-                2120,
-                2130,
-                2140,
-                2150,
-                2160,
-                2170,
-                2180,
-                2190,
-                2200,
-                2210,
-                2220,
-                2230,
-                2240,
-                2250,
-                2260,
-                2270,
-                2280,
-                2290,
-                2300,
-                2310,
-                2320,
-                2330,
-                2340,
-                2350,
-                2360,
-                2370,
-                2380,
-                2390,
-                2400,
-                2410,
-                2420,
-                2430,
-                2440,
-                2450,
-                2460,
-                2470,
-                2480,
-                2490,
-                2500,
-                2510,
-                2520,
-                2530,
-                2540,
-                2550,
-                2560,
-                2570,
-                2580,
-                2590,
-                2600,
-                2610,
-                2620,
-                2630,
-                2640,
-                2650,
-                2660,
-                2670,
-                2680,
-                2690,
-                2700,
-                2710,
-                2720,
-                2730,
-                2740,
-                2750,
-                2760,
-                2770,
-                2780,
-                2790,
-                2800,
-                2810,
-                2820,
-                2830,
-                2840,
-                2850,
-                2860,
-                2870,
-                2880,
-                2890,
-                2900,
-                2910,
-                2920,
-                2930,
-                2940,
-                2950,
-                2960,
-                2970,
-                2980,
-                2990,
-                3000,
-                3010,
-                3020,
-                3030,
-                3040,
-                3050,
-                3060,
-                3070,
-                3080,
-                3090,
-                3100,
-                3110,
-                3120,
-                3130,
-                3140,
-                3150,
-                3160,
-                3170,
-                3180,
-                3190,
-                3200,
-                3210,
-                3220,
-                3230,
-                3240,
-                3250,
-                3260,
-                3270,
-                3280,
-                3290,
-                3300,
-                3310,
-                3320,
-                3330,
-                3340,
-                3350,
-                3360,
-                3370,
-                3380,
-                3390,
-                3400,
-                3410,
-                3420,
-                3430,
-                3440,
-                3450,
-                3460,
-                3470,
-                3480,
-                3490,
-                3500,
-                3510,
-                3520,
-                3530,
-                3540,
-                3550,
-                3560,
-                3570,
-                3580,
-                3590,
-                3600,
-                3610,
-                3620,
-                3630,
-                3640,
-                3650,
-                3660,
-                3670,
-                3680,
-                3690,
-                3700,
-                3710,
-                3720,
-                3730,
-                3740,
-                3750,
-                3760,
-                3770,
-                3780,
-                3790,
-                3800,
-                3810,
-                3820,
-                3830,
-                3840,
-                3850,
-                3860,
-                3870,
-                3880,
-                3890,
-                3900,
-                3910,
-                3920,
-                3930,
-                3940,
-                3950,
-                3960,
-                3970,
-                3980,
-                3990,
-                4000,
-                4010,
-                4020,
-                4030,
-                4040,
-                4050,
-                4060,
-                4070,
-                4080,
-                4090,
-                4100,
-                4110,
-                4120,
-                4130,
-                4140,
-                4150,
-                4160,
-                4170,
-                4180,
-                4190,
-                4200,
-                4210,
-                4220,
-                4230,
-                4240,
-                4250,
-                4260,
-                4270,
-                4280,
-                4290,
-                4300
+                10000,
+                20000,
+                30000,
+                40000,
+                50000,
+                60000,
+                70000,
+                80000,
+                90000,
+                100000,
+                110000,
+                120000,
+                130000,
+                140000,
+                150000,
+                160000,
+                170000,
+                180000,
+                190000,
+                200000,
+                210000,
+                220000,
+                230000,
+                240000,
+                250000,
+                260000,
+                270000,
+                280000,
+                290000,
+                300000,
+                310000,
+                320000,
+                330000,
+                340000,
+                350000,
+                360000,
+                370000,
+                380000,
+                390000,
+                400000,
+                410000,
+                420000,
+                430000,
+                440000,
+                450000,
+                460000,
+                470000,
+                480000,
+                490000,
+                500000,
+                510000,
+                520000,
+                530000,
+                540000,
+                550000,
+                560000,
+                570000,
+                580000,
+                590000,
+                600000,
+                610000,
+                620000,
+                630000,
+                640000,
+                650000,
+                660000,
+                670000,
+                680000,
+                690000,
+                700000,
+                710000,
+                720000,
+                730000,
+                740000,
+                750000,
+                760000,
+                770000,
+                780000,
+                790000,
+                800000,
+                810000,
+                820000,
+                830000,
+                840000,
+                850000,
+                860000,
+                870000,
+                880000,
+                890000,
+                900000,
+                910000,
+                920000,
+                930000,
+                940000,
+                950000,
+                960000,
+                970000,
+                980000,
+                990000,
+                1000000,
+                1010000,
+                1020000,
+                1030000,
+                1040000,
+                1050000,
+                1060000,
+                1070000,
+                1080000,
+                1090000,
+                1100000,
+                1110000,
+                1120000,
+                1130000,
+                1140000,
+                1150000,
+                1160000,
+                1170000,
+                1180000,
+                1190000,
+                1200000,
+                1210000,
+                1220000,
+                1230000,
+                1240000,
+                1250000,
+                1260000,
+                1270000,
+                1280000,
+                1290000,
+                1300000,
+                1310000,
+                1320000,
+                1330000,
+                1340000,
+                1350000,
+                1360000,
+                1370000,
+                1380000,
+                1390000,
+                1400000,
+                1410000,
+                1420000,
+                1430000,
+                1440000,
+                1450000,
+                1460000,
+                1470000,
+                1480000,
+                1490000,
+                1500000,
+                1510000,
+                1520000,
+                1530000,
+                1540000,
+                1550000,
+                1560000,
+                1570000,
+                1580000,
+                1590000,
+                1600000,
+                1610000,
+                1620000,
+                1630000,
+                1640000,
+                1650000,
+                1660000,
+                1670000,
+                1680000,
+                1690000,
+                1700000,
+                1710000,
+                1720000,
+                1730000,
+                1740000,
+                1750000,
+                1760000,
+                1770000,
+                1780000,
+                1790000,
+                1800000,
+                1810000,
+                1820000,
+                1830000,
+                1840000,
+                1850000,
+                1860000,
+                1870000,
+                1880000,
+                1890000,
+                1900000,
+                1910000,
+                1920000,
+                1930000,
+                1940000,
+                1950000,
+                1960000,
+                1970000,
+                1980000,
+                1990000,
+                2000000,
+                2010000,
+                2020000,
+                2030000,
+                2040000,
+                2050000,
+                2060000,
+                2070000,
+                2080000,
+                2090000,
+                2100000,
+                2110000,
+                2120000,
+                2130000,
+                2140000,
+                2150000,
+                2160000,
+                2170000,
+                2180000,
+                2190000,
+                2200000,
+                2210000,
+                2220000,
+                2230000,
+                2240000,
+                2250000,
+                2260000,
+                2270000,
+                2280000,
+                2290000,
+                2300000,
+                2310000,
+                2320000,
+                2330000,
+                2340000,
+                2350000,
+                2360000,
+                2370000,
+                2380000,
+                2390000,
+                2400000,
+                2410000,
+                2420000,
+                2430000,
+                2440000,
+                2450000,
+                2460000,
+                2470000,
+                2480000,
+                2490000,
+                2500000,
+                2510000,
+                2520000,
+                2530000,
+                2540000,
+                2550000,
+                2560000,
+                2570000,
+                2580000,
+                2590000,
+                2600000,
+                2610000,
+                2620000,
+                2630000,
+                2640000,
+                2650000,
+                2660000,
+                2670000,
+                2680000,
+                2690000,
+                2700000,
+                2710000,
+                2720000,
+                2730000,
+                2740000,
+                2750000,
+                2760000,
+                2770000,
+                2780000,
+                2790000,
+                2800000,
+                2810000,
+                2820000,
+                2830000,
+                2840000,
+                2850000,
+                2860000,
+                2870000,
+                2880000,
+                2890000,
+                2900000,
+                2910000,
+                2920000,
+                2930000,
+                2940000,
+                2950000,
+                2960000,
+                2970000,
+                2980000,
+                2990000,
+                3000000,
+                3010000,
+                3020000,
+                3030000,
+                3040000,
+                3050000,
+                3060000,
+                3070000,
+                3080000,
+                3090000,
+                3100000,
+                3110000,
+                3120000,
+                3130000,
+                3140000,
+                3150000,
+                3160000,
+                3170000,
+                3180000,
+                3190000,
+                3200000,
+                3210000,
+                3220000,
+                3230000,
+                3240000,
+                3250000,
+                3260000,
+                3270000,
+                3280000,
+                3290000,
+                3300000,
+                3310000,
+                3320000,
+                3330000,
+                3340000,
+                3350000,
+                3360000,
+                3370000,
+                3380000,
+                3390000,
+                3400000,
+                3410000,
+                3420000,
+                3430000,
+                3440000,
+                3450000,
+                3460000,
+                3470000,
+                3480000,
+                3490000,
+                3500000,
+                3510000,
+                3520000,
+                3530000,
+                3540000,
+                3550000,
+                3560000,
+                3570000,
+                3580000,
+                3590000,
+                3600000,
+                3610000,
+                3620000,
+                3630000,
+                3640000,
+                3650000,
+                3660000,
+                3670000,
+                3680000,
+                3690000,
+                3700000,
+                3710000,
+                3720000,
+                3730000,
+                3740000,
+                3750000,
+                3760000,
+                3770000,
+                3780000,
+                3790000,
+                3800000,
+                3810000,
+                3820000,
+                3830000,
+                3840000,
+                3850000,
+                3860000,
+                3870000,
+                3880000,
+                3890000,
+                3900000,
+                3910000,
+                3920000,
+                3930000,
+                3940000,
+                3950000,
+                3960000,
+                3970000,
+                3980000,
+                3990000,
+                4000000,
+                4010000,
+                4020000,
+                4030000,
+                4040000,
+                4050000,
+                4060000,
+                4070000,
+                4080000,
+                4090000,
+                4100000,
+                4110000,
+                4120000,
+                4130000,
+                4140000,
+                4150000,
+                4160000,
+                4170000,
+                4180000,
+                4190000,
+                4200000,
+                4210000,
+                4220000,
+                4230000,
+                4240000,
+                4250000,
+                4260000,
+                4270000,
+                4280000,
+                4290000,
+                4300000
               ],
               "values": [
                 145,
@@ -940,266 +940,266 @@
             },
             "ceiling": {
               "times": [
-                730,
-                800,
-                810,
-                820,
-                830,
-                840,
-                850,
-                860,
-                870,
-                890,
-                900,
-                930,
-                940,
-                950,
-                960,
-                970,
-                980,
-                990,
-                1000,
-                1010,
-                1020,
-                1030,
-                1040,
-                1050,
-                1060,
-                1070,
-                1080,
-                1090,
-                1100,
-                1110,
-                1120,
-                1130,
-                1140,
-                1150,
-                1160,
-                1170,
-                1180,
-                1190,
-                1200,
-                1210,
-                1220,
-                1230,
-                1240,
-                1250,
-                1260,
-                1270,
-                1280,
-                1290,
-                1300,
-                1310,
-                1320,
-                1330,
-                1340,
-                1350,
-                1360,
-                1370,
-                1380,
-                1390,
-                1400,
-                1410,
-                1420,
-                1430,
-                1440,
-                1450,
-                1460,
-                1470,
-                1480,
-                1490,
-                1500,
-                1510,
-                1520,
-                1530,
-                1540,
-                1550,
-                1560,
-                1570,
-                1580,
-                1590,
-                1600,
-                1610,
-                1620,
-                1630,
-                1640,
-                1650,
-                1660,
-                1670,
-                1680,
-                1690,
-                1700,
-                1710,
-                1720,
-                1730,
-                1740,
-                1750,
-                1760,
-                1770,
-                1780,
-                1790,
-                1800,
-                1810,
-                1820,
-                1830,
-                1840,
-                1850,
-                1860,
-                1870,
-                1880,
-                1890,
-                1900,
-                1910,
-                1920,
-                1930,
-                1940,
-                1950,
-                1960,
-                1970,
-                1980,
-                1990,
-                2000,
-                2010,
-                2020,
-                2030,
-                2040,
-                2050,
-                2060,
-                2070,
-                2080,
-                2090,
-                2100,
-                2110,
-                2120,
-                2130,
-                2140,
-                2150,
-                2160,
-                2170,
-                2180,
-                2190,
-                2200,
-                2210,
-                2220,
-                2230,
-                2240,
-                2250,
-                2260,
-                2270,
-                2280,
-                2290,
-                2300,
-                2310,
-                2320,
-                2330,
-                2340,
-                2350,
-                2360,
-                2370,
-                2380,
-                2390,
-                2400,
-                2410,
-                2420,
-                2430,
-                2440,
-                2450,
-                2460,
-                2470,
-                2480,
-                2490,
-                2500,
-                2510,
-                2520,
-                2530,
-                2540,
-                2550,
-                2560,
-                2570,
-                2580,
-                2590,
-                2600,
-                2610,
-                2620,
-                2630,
-                2640,
-                2650,
-                2660,
-                2670,
-                2680,
-                2690,
-                2700,
-                2710,
-                2720,
-                2730,
-                2740,
-                2750,
-                2760,
-                2770,
-                2780,
-                2790,
-                2800,
-                2810,
-                2820,
-                2830,
-                2840,
-                2850,
-                2860,
-                2870,
-                2880,
-                2890,
-                2900,
-                2910,
-                2920,
-                2940,
-                2960,
-                2970,
-                2990,
-                3000,
-                3010,
-                3020,
-                3040,
-                3060,
-                3070,
-                3080,
-                3090,
-                3100,
-                3110,
-                3120,
-                3130,
-                3140,
-                3150,
-                3160,
-                3170,
-                3180,
-                3190,
-                3210,
-                3220,
-                3230,
-                3240,
-                3250,
-                3260,
-                3270,
-                3280,
-                3290,
-                3310,
-                3320,
-                3340,
-                3360,
-                3370,
-                3380,
-                3390,
-                3400,
-                3420,
-                3430,
-                3440,
-                3450,
-                3460,
-                3470,
-                3480,
-                3490,
-                3500,
-                3510
+                730000,
+                800000,
+                810000,
+                820000,
+                830000,
+                840000,
+                850000,
+                860000,
+                870000,
+                890000,
+                900000,
+                930000,
+                940000,
+                950000,
+                960000,
+                970000,
+                980000,
+                990000,
+                1000000,
+                1010000,
+                1020000,
+                1030000,
+                1040000,
+                1050000,
+                1060000,
+                1070000,
+                1080000,
+                1090000,
+                1100000,
+                1110000,
+                1120000,
+                1130000,
+                1140000,
+                1150000,
+                1160000,
+                1170000,
+                1180000,
+                1190000,
+                1200000,
+                1210000,
+                1220000,
+                1230000,
+                1240000,
+                1250000,
+                1260000,
+                1270000,
+                1280000,
+                1290000,
+                1300000,
+                1310000,
+                1320000,
+                1330000,
+                1340000,
+                1350000,
+                1360000,
+                1370000,
+                1380000,
+                1390000,
+                1400000,
+                1410000,
+                1420000,
+                1430000,
+                1440000,
+                1450000,
+                1460000,
+                1470000,
+                1480000,
+                1490000,
+                1500000,
+                1510000,
+                1520000,
+                1530000,
+                1540000,
+                1550000,
+                1560000,
+                1570000,
+                1580000,
+                1590000,
+                1600000,
+                1610000,
+                1620000,
+                1630000,
+                1640000,
+                1650000,
+                1660000,
+                1670000,
+                1680000,
+                1690000,
+                1700000,
+                1710000,
+                1720000,
+                1730000,
+                1740000,
+                1750000,
+                1760000,
+                1770000,
+                1780000,
+                1790000,
+                1800000,
+                1810000,
+                1820000,
+                1830000,
+                1840000,
+                1850000,
+                1860000,
+                1870000,
+                1880000,
+                1890000,
+                1900000,
+                1910000,
+                1920000,
+                1930000,
+                1940000,
+                1950000,
+                1960000,
+                1970000,
+                1980000,
+                1990000,
+                2000000,
+                2010000,
+                2020000,
+                2030000,
+                2040000,
+                2050000,
+                2060000,
+                2070000,
+                2080000,
+                2090000,
+                2100000,
+                2110000,
+                2120000,
+                2130000,
+                2140000,
+                2150000,
+                2160000,
+                2170000,
+                2180000,
+                2190000,
+                2200000,
+                2210000,
+                2220000,
+                2230000,
+                2240000,
+                2250000,
+                2260000,
+                2270000,
+                2280000,
+                2290000,
+                2300000,
+                2310000,
+                2320000,
+                2330000,
+                2340000,
+                2350000,
+                2360000,
+                2370000,
+                2380000,
+                2390000,
+                2400000,
+                2410000,
+                2420000,
+                2430000,
+                2440000,
+                2450000,
+                2460000,
+                2470000,
+                2480000,
+                2490000,
+                2500000,
+                2510000,
+                2520000,
+                2530000,
+                2540000,
+                2550000,
+                2560000,
+                2570000,
+                2580000,
+                2590000,
+                2600000,
+                2610000,
+                2620000,
+                2630000,
+                2640000,
+                2650000,
+                2660000,
+                2670000,
+                2680000,
+                2690000,
+                2700000,
+                2710000,
+                2720000,
+                2730000,
+                2740000,
+                2750000,
+                2760000,
+                2770000,
+                2780000,
+                2790000,
+                2800000,
+                2810000,
+                2820000,
+                2830000,
+                2840000,
+                2850000,
+                2860000,
+                2870000,
+                2880000,
+                2890000,
+                2900000,
+                2910000,
+                2920000,
+                2940000,
+                2960000,
+                2970000,
+                2990000,
+                3000000,
+                3010000,
+                3020000,
+                3040000,
+                3060000,
+                3070000,
+                3080000,
+                3090000,
+                3100000,
+                3110000,
+                3120000,
+                3130000,
+                3140000,
+                3150000,
+                3160000,
+                3170000,
+                3180000,
+                3190000,
+                3210000,
+                3220000,
+                3230000,
+                3240000,
+                3250000,
+                3260000,
+                3270000,
+                3280000,
+                3290000,
+                3310000,
+                3320000,
+                3340000,
+                3360000,
+                3370000,
+                3380000,
+                3390000,
+                3400000,
+                3420000,
+                3430000,
+                3440000,
+                3450000,
+                3460000,
+                3470000,
+                3480000,
+                3490000,
+                3500000,
+                3510000
               ],
               "values": [
                 300,
@@ -1466,712 +1466,712 @@
             },
             "temperature": {
               "times": [
-                8,
-                11,
-                16,
-                21,
-                23,
-                26,
-                30,
-                31,
-                37,
-                38,
-                44,
-                52,
-                58,
-                59,
-                66,
-                73,
-                77,
-                80,
-                87,
-                95,
-                102,
-                109,
-                116,
-                123,
-                124,
-                130,
-                138,
-                145,
-                152,
-                156,
-                159,
-                166,
-                173,
-                180,
-                181,
-                188,
-                195,
-                202,
-                204,
-                209,
-                216,
-                224,
-                228,
-                231,
-                238,
-                239,
-                245,
-                252,
-                259,
-                263,
-                267,
-                268,
-                274,
-                276,
-                281,
-                288,
-                294,
-                295,
-                302,
-                310,
-                317,
-                324,
-                331,
-                338,
-                345,
-                353,
-                360,
-                364,
-                367,
-                374,
-                381,
-                388,
-                396,
-                403,
-                410,
-                417,
-                424,
-                426,
-                431,
-                439,
-                446,
-                453,
-                460,
-                467,
-                474,
-                482,
-                489,
-                496,
-                503,
-                510,
-                517,
-                522,
-                525,
-                532,
-                539,
-                546,
-                553,
-                560,
-                568,
-                575,
-                582,
-                589,
-                596,
-                603,
-                611,
-                618,
-                625,
-                632,
-                639,
-                646,
-                654,
-                661,
-                668,
-                675,
-                682,
-                689,
-                697,
-                704,
-                711,
-                718,
-                725,
-                732,
-                740,
-                747,
-                754,
-                761,
-                768,
-                775,
-                783,
-                790,
-                797,
-                804,
-                811,
-                818,
-                826,
-                833,
-                840,
-                847,
-                854,
-                861,
-                869,
-                875,
-                876,
-                883,
-                888,
-                890,
-                891,
-                897,
-                904,
-                912,
-                918,
-                919,
-                926,
-                933,
-                940,
-                943,
-                947,
-                955,
-                962,
-                969,
-                976,
-                983,
-                990,
-                998,
-                1005,
-                1012,
-                1019,
-                1026,
-                1033,
-                1041,
-                1048,
-                1055,
-                1062,
-                1069,
-                1076,
-                1084,
-                1091,
-                1098,
-                1105,
-                1112,
-                1119,
-                1125,
-                1127,
-                1129,
-                1134,
-                1141,
-                1148,
-                1155,
-                1162,
-                1170,
-                1177,
-                1184,
-                1191,
-                1198,
-                1205,
-                1213,
-                1220,
-                1227,
-                1234,
-                1241,
-                1248,
-                1256,
-                1263,
-                1270,
-                1277,
-                1284,
-                1291,
-                1299,
-                1306,
-                1313,
-                1320,
-                1327,
-                1334,
-                1342,
-                1349,
-                1356,
-                1363,
-                1370,
-                1377,
-                1385,
-                1392,
-                1399,
-                1406,
-                1413,
-                1420,
-                1428,
-                1435,
-                1442,
-                1449,
-                1456,
-                1463,
-                1471,
-                1478,
-                1485,
-                1492,
-                1499,
-                1500,
-                1506,
-                1514,
-                1521,
-                1528,
-                1535,
-                1538,
-                1542,
-                1549,
-                1557,
-                1564,
-                1571,
-                1578,
-                1585,
-                1591,
-                1592,
-                1599,
-                1600,
-                1602,
-                1607,
-                1613,
-                1614,
-                1618,
-                1621,
-                1628,
-                1635,
-                1643,
-                1650,
-                1657,
-                1664,
-                1671,
-                1678,
-                1683,
-                1686,
-                1688,
-                1693,
-                1700,
-                1703,
-                1707,
-                1714,
-                1721,
-                1728,
-                1729,
-                1736,
-                1743,
-                1750,
-                1751,
-                1757,
-                1764,
-                1769,
-                1772,
-                1779,
-                1781,
-                1786,
-                1787,
-                1793,
-                1799,
-                1800,
-                1802,
-                1807,
-                1815,
-                1822,
-                1829,
-                1836,
-                1843,
-                1850,
-                1858,
-                1865,
-                1872,
-                1879,
-                1886,
-                1893,
-                1901,
-                1908,
-                1915,
-                1922,
-                1929,
-                1936,
-                1944,
-                1951,
-                1958,
-                1965,
-                1972,
-                1979,
-                1984,
-                1987,
-                1994,
-                2001,
-                2008,
-                2015,
-                2022,
-                2029,
-                2030,
-                2032,
-                2037,
-                2044,
-                2051,
-                2058,
-                2059,
-                2065,
-                2067,
-                2073,
-                2077,
-                2080,
-                2086,
-                2087,
-                2090,
-                2094,
-                2096,
-                2101,
-                2108,
-                2116,
-                2123,
-                2130,
-                2137,
-                2144,
-                2151,
-                2159,
-                2166,
-                2173,
-                2180,
-                2187,
-                2194,
-                2202,
-                2209,
-                2216,
-                2223,
-                2230,
-                2237,
-                2245,
-                2252,
-                2259,
-                2266,
-                2273,
-                2280,
-                2288,
-                2295,
-                2302,
-                2309,
-                2316,
-                2323,
-                2331,
-                2338,
-                2345,
-                2352,
-                2359,
-                2366,
-                2374,
-                2381,
-                2388,
-                2395,
-                2402,
-                2409,
-                2417,
-                2424,
-                2431,
-                2438,
-                2445,
-                2452,
-                2460,
-                2467,
-                2470,
-                2474,
-                2481,
-                2488,
-                2495,
-                2503,
-                2510,
-                2517,
-                2524,
-                2531,
-                2538,
-                2546,
-                2553,
-                2560,
-                2567,
-                2574,
-                2581,
-                2589,
-                2596,
-                2603,
-                2610,
-                2617,
-                2624,
-                2632,
-                2639,
-                2646,
-                2653,
-                2660,
-                2667,
-                2675,
-                2682,
-                2689,
-                2696,
-                2703,
-                2710,
-                2718,
-                2725,
-                2728,
-                2732,
-                2736,
-                2739,
-                2741,
-                2746,
-                2753,
-                2761,
-                2768,
-                2772,
-                2775,
-                2782,
-                2785,
-                2789,
-                2793,
-                2796,
-                2804,
-                2809,
-                2811,
-                2818,
-                2825,
-                2832,
-                2839,
-                2847,
-                2854,
-                2855,
-                2861,
-                2865,
-                2868,
-                2875,
-                2882,
-                2890,
-                2897,
-                2904,
-                2911,
-                2918,
-                2925,
-                2933,
-                2940,
-                2947,
-                2954,
-                2961,
-                2968,
-                2976,
-                2983,
-                2990,
-                2997,
-                3004,
-                3011,
-                3019,
-                3026,
-                3033,
-                3037,
-                3040,
-                3041,
-                3047,
-                3052,
-                3054,
-                3058,
-                3062,
-                3069,
-                3076,
-                3077,
-                3083,
-                3085,
-                3090,
-                3097,
-                3104,
-                3105,
-                3112,
-                3119,
-                3126,
-                3133,
-                3140,
-                3148,
-                3155,
-                3162,
-                3164,
-                3169,
-                3176,
-                3183,
-                3191,
-                3198,
-                3205,
-                3206,
-                3212,
-                3219,
-                3226,
-                3233,
-                3234,
-                3241,
-                3248,
-                3254,
-                3255,
-                3262,
-                3268,
-                3269,
-                3277,
-                3284,
-                3291,
-                3294,
-                3298,
-                3305,
-                3312,
-                3316,
-                3320,
-                3321,
-                3327,
-                3334,
-                3341,
-                3344,
-                3348,
-                3355,
-                3363,
-                3370,
-                3375,
-                3377,
-                3384,
-                3391,
-                3398,
-                3406,
-                3413,
-                3420,
-                3427,
-                3434,
-                3441,
-                3449,
-                3456,
-                3463,
-                3470,
-                3477,
-                3484,
-                3492,
-                3499,
-                3506,
-                3513,
-                3520,
-                3522,
-                3527,
-                3535,
-                3542,
-                3549,
-                3556,
-                3561,
-                3563,
-                3570,
-                3578,
-                3585,
-                3592,
-                3599,
-                3606,
-                3613,
-                3621,
-                3628,
-                3635,
-                3642,
-                3649,
-                3656,
-                3664,
-                3671,
-                3678,
-                3685,
-                3692,
-                3699,
-                3707,
-                3714,
-                3721,
-                3728,
-                3735,
-                3742,
-                3750,
-                3757,
-                3764,
-                3771,
-                3778,
-                3785,
-                3793,
-                3800,
-                3807,
-                3814,
-                3821,
-                3824,
-                3828,
-                3836,
-                3837,
-                3843,
-                3850,
-                3857,
-                3864,
-                3871,
-                3879,
-                3886,
-                3893,
-                3900,
-                3907,
-                3914,
-                3922,
-                3929,
-                3936,
-                3943,
-                3950,
-                3957,
-                3965,
-                3972,
-                3979,
-                3986,
-                3993,
-                4000,
-                4007,
-                4008,
-                4014,
-                4015,
-                4021,
-                4022,
-                4026,
-                4029,
-                4032,
-                4036,
-                4040,
-                4043,
-                4051,
-                4058,
-                4063,
-                4065,
-                4072,
-                4077,
-                4079,
-                4085,
-                4086,
-                4088,
-                4094,
-                4101,
-                4108,
-                4115,
-                4117,
-                4122,
-                4129,
-                4130,
-                4137,
-                4144,
-                4146,
-                4151,
-                4158,
-                4165,
-                4166,
-                4172,
-                4180,
-                4185,
-                4187,
-                4194,
-                4201,
-                4208,
-                4212,
-                4215,
-                4217,
-                4223,
-                4230,
-                4237,
-                4244,
-                4248,
-                4251,
-                4254,
-                4258,
-                4262,
-                4266,
-                4273,
-                4280,
-                4284,
-                4287,
-                4294,
-                4299,
-                4301
+                8000,
+                11000,
+                16000,
+                21000,
+                23000,
+                26000,
+                30000,
+                31000,
+                37000,
+                38000,
+                44000,
+                52000,
+                58000,
+                59000,
+                66000,
+                73000,
+                77000,
+                80000,
+                87000,
+                95000,
+                102000,
+                109000,
+                116000,
+                123000,
+                124000,
+                130000,
+                138000,
+                145000,
+                152000,
+                156000,
+                159000,
+                166000,
+                173000,
+                180000,
+                181000,
+                188000,
+                195000,
+                202000,
+                204000,
+                209000,
+                216000,
+                224000,
+                228000,
+                231000,
+                238000,
+                239000,
+                245000,
+                252000,
+                259000,
+                263000,
+                267000,
+                268000,
+                274000,
+                276000,
+                281000,
+                288000,
+                294000,
+                295000,
+                302000,
+                310000,
+                317000,
+                324000,
+                331000,
+                338000,
+                345000,
+                353000,
+                360000,
+                364000,
+                367000,
+                374000,
+                381000,
+                388000,
+                396000,
+                403000,
+                410000,
+                417000,
+                424000,
+                426000,
+                431000,
+                439000,
+                446000,
+                453000,
+                460000,
+                467000,
+                474000,
+                482000,
+                489000,
+                496000,
+                503000,
+                510000,
+                517000,
+                522000,
+                525000,
+                532000,
+                539000,
+                546000,
+                553000,
+                560000,
+                568000,
+                575000,
+                582000,
+                589000,
+                596000,
+                603000,
+                611000,
+                618000,
+                625000,
+                632000,
+                639000,
+                646000,
+                654000,
+                661000,
+                668000,
+                675000,
+                682000,
+                689000,
+                697000,
+                704000,
+                711000,
+                718000,
+                725000,
+                732000,
+                740000,
+                747000,
+                754000,
+                761000,
+                768000,
+                775000,
+                783000,
+                790000,
+                797000,
+                804000,
+                811000,
+                818000,
+                826000,
+                833000,
+                840000,
+                847000,
+                854000,
+                861000,
+                869000,
+                875000,
+                876000,
+                883000,
+                888000,
+                890000,
+                891000,
+                897000,
+                904000,
+                912000,
+                918000,
+                919000,
+                926000,
+                933000,
+                940000,
+                943000,
+                947000,
+                955000,
+                962000,
+                969000,
+                976000,
+                983000,
+                990000,
+                998000,
+                1005000,
+                1012000,
+                1019000,
+                1026000,
+                1033000,
+                1041000,
+                1048000,
+                1055000,
+                1062000,
+                1069000,
+                1076000,
+                1084000,
+                1091000,
+                1098000,
+                1105000,
+                1112000,
+                1119000,
+                1125000,
+                1127000,
+                1129000,
+                1134000,
+                1141000,
+                1148000,
+                1155000,
+                1162000,
+                1170000,
+                1177000,
+                1184000,
+                1191000,
+                1198000,
+                1205000,
+                1213000,
+                1220000,
+                1227000,
+                1234000,
+                1241000,
+                1248000,
+                1256000,
+                1263000,
+                1270000,
+                1277000,
+                1284000,
+                1291000,
+                1299000,
+                1306000,
+                1313000,
+                1320000,
+                1327000,
+                1334000,
+                1342000,
+                1349000,
+                1356000,
+                1363000,
+                1370000,
+                1377000,
+                1385000,
+                1392000,
+                1399000,
+                1406000,
+                1413000,
+                1420000,
+                1428000,
+                1435000,
+                1442000,
+                1449000,
+                1456000,
+                1463000,
+                1471000,
+                1478000,
+                1485000,
+                1492000,
+                1499000,
+                1500000,
+                1506000,
+                1514000,
+                1521000,
+                1528000,
+                1535000,
+                1538000,
+                1542000,
+                1549000,
+                1557000,
+                1564000,
+                1571000,
+                1578000,
+                1585000,
+                1591000,
+                1592000,
+                1599000,
+                1600000,
+                1602000,
+                1607000,
+                1613000,
+                1614000,
+                1618000,
+                1621000,
+                1628000,
+                1635000,
+                1643000,
+                1650000,
+                1657000,
+                1664000,
+                1671000,
+                1678000,
+                1683000,
+                1686000,
+                1688000,
+                1693000,
+                1700000,
+                1703000,
+                1707000,
+                1714000,
+                1721000,
+                1728000,
+                1729000,
+                1736000,
+                1743000,
+                1750000,
+                1751000,
+                1757000,
+                1764000,
+                1769000,
+                1772000,
+                1779000,
+                1781000,
+                1786000,
+                1787000,
+                1793000,
+                1799000,
+                1800000,
+                1802000,
+                1807000,
+                1815000,
+                1822000,
+                1829000,
+                1836000,
+                1843000,
+                1850000,
+                1858000,
+                1865000,
+                1872000,
+                1879000,
+                1886000,
+                1893000,
+                1901000,
+                1908000,
+                1915000,
+                1922000,
+                1929000,
+                1936000,
+                1944000,
+                1951000,
+                1958000,
+                1965000,
+                1972000,
+                1979000,
+                1984000,
+                1987000,
+                1994000,
+                2001000,
+                2008000,
+                2015000,
+                2022000,
+                2029000,
+                2030000,
+                2032000,
+                2037000,
+                2044000,
+                2051000,
+                2058000,
+                2059000,
+                2065000,
+                2067000,
+                2073000,
+                2077000,
+                2080000,
+                2086000,
+                2087000,
+                2090000,
+                2094000,
+                2096000,
+                2101000,
+                2108000,
+                2116000,
+                2123000,
+                2130000,
+                2137000,
+                2144000,
+                2151000,
+                2159000,
+                2166000,
+                2173000,
+                2180000,
+                2187000,
+                2194000,
+                2202000,
+                2209000,
+                2216000,
+                2223000,
+                2230000,
+                2237000,
+                2245000,
+                2252000,
+                2259000,
+                2266000,
+                2273000,
+                2280000,
+                2288000,
+                2295000,
+                2302000,
+                2309000,
+                2316000,
+                2323000,
+                2331000,
+                2338000,
+                2345000,
+                2352000,
+                2359000,
+                2366000,
+                2374000,
+                2381000,
+                2388000,
+                2395000,
+                2402000,
+                2409000,
+                2417000,
+                2424000,
+                2431000,
+                2438000,
+                2445000,
+                2452000,
+                2460000,
+                2467000,
+                2470000,
+                2474000,
+                2481000,
+                2488000,
+                2495000,
+                2503000,
+                2510000,
+                2517000,
+                2524000,
+                2531000,
+                2538000,
+                2546000,
+                2553000,
+                2560000,
+                2567000,
+                2574000,
+                2581000,
+                2589000,
+                2596000,
+                2603000,
+                2610000,
+                2617000,
+                2624000,
+                2632000,
+                2639000,
+                2646000,
+                2653000,
+                2660000,
+                2667000,
+                2675000,
+                2682000,
+                2689000,
+                2696000,
+                2703000,
+                2710000,
+                2718000,
+                2725000,
+                2728000,
+                2732000,
+                2736000,
+                2739000,
+                2741000,
+                2746000,
+                2753000,
+                2761000,
+                2768000,
+                2772000,
+                2775000,
+                2782000,
+                2785000,
+                2789000,
+                2793000,
+                2796000,
+                2804000,
+                2809000,
+                2811000,
+                2818000,
+                2825000,
+                2832000,
+                2839000,
+                2847000,
+                2854000,
+                2855000,
+                2861000,
+                2865000,
+                2868000,
+                2875000,
+                2882000,
+                2890000,
+                2897000,
+                2904000,
+                2911000,
+                2918000,
+                2925000,
+                2933000,
+                2940000,
+                2947000,
+                2954000,
+                2961000,
+                2968000,
+                2976000,
+                2983000,
+                2990000,
+                2997000,
+                3004000,
+                3011000,
+                3019000,
+                3026000,
+                3033000,
+                3037000,
+                3040000,
+                3041000,
+                3047000,
+                3052000,
+                3054000,
+                3058000,
+                3062000,
+                3069000,
+                3076000,
+                3077000,
+                3083000,
+                3085000,
+                3090000,
+                3097000,
+                3104000,
+                3105000,
+                3112000,
+                3119000,
+                3126000,
+                3133000,
+                3140000,
+                3148000,
+                3155000,
+                3162000,
+                3164000,
+                3169000,
+                3176000,
+                3183000,
+                3191000,
+                3198000,
+                3205000,
+                3206000,
+                3212000,
+                3219000,
+                3226000,
+                3233000,
+                3234000,
+                3241000,
+                3248000,
+                3254000,
+                3255000,
+                3262000,
+                3268000,
+                3269000,
+                3277000,
+                3284000,
+                3291000,
+                3294000,
+                3298000,
+                3305000,
+                3312000,
+                3316000,
+                3320000,
+                3321000,
+                3327000,
+                3334000,
+                3341000,
+                3344000,
+                3348000,
+                3355000,
+                3363000,
+                3370000,
+                3375000,
+                3377000,
+                3384000,
+                3391000,
+                3398000,
+                3406000,
+                3413000,
+                3420000,
+                3427000,
+                3434000,
+                3441000,
+                3449000,
+                3456000,
+                3463000,
+                3470000,
+                3477000,
+                3484000,
+                3492000,
+                3499000,
+                3506000,
+                3513000,
+                3520000,
+                3522000,
+                3527000,
+                3535000,
+                3542000,
+                3549000,
+                3556000,
+                3561000,
+                3563000,
+                3570000,
+                3578000,
+                3585000,
+                3592000,
+                3599000,
+                3606000,
+                3613000,
+                3621000,
+                3628000,
+                3635000,
+                3642000,
+                3649000,
+                3656000,
+                3664000,
+                3671000,
+                3678000,
+                3685000,
+                3692000,
+                3699000,
+                3707000,
+                3714000,
+                3721000,
+                3728000,
+                3735000,
+                3742000,
+                3750000,
+                3757000,
+                3764000,
+                3771000,
+                3778000,
+                3785000,
+                3793000,
+                3800000,
+                3807000,
+                3814000,
+                3821000,
+                3824000,
+                3828000,
+                3836000,
+                3837000,
+                3843000,
+                3850000,
+                3857000,
+                3864000,
+                3871000,
+                3879000,
+                3886000,
+                3893000,
+                3900000,
+                3907000,
+                3914000,
+                3922000,
+                3929000,
+                3936000,
+                3943000,
+                3950000,
+                3957000,
+                3965000,
+                3972000,
+                3979000,
+                3986000,
+                3993000,
+                4000000,
+                4007000,
+                4008000,
+                4014000,
+                4015000,
+                4021000,
+                4022000,
+                4026000,
+                4029000,
+                4032000,
+                4036000,
+                4040000,
+                4043000,
+                4051000,
+                4058000,
+                4063000,
+                4065000,
+                4072000,
+                4077000,
+                4079000,
+                4085000,
+                4086000,
+                4088000,
+                4094000,
+                4101000,
+                4108000,
+                4115000,
+                4117000,
+                4122000,
+                4129000,
+                4130000,
+                4137000,
+                4144000,
+                4146000,
+                4151000,
+                4158000,
+                4165000,
+                4166000,
+                4172000,
+                4180000,
+                4185000,
+                4187000,
+                4194000,
+                4201000,
+                4208000,
+                4212000,
+                4215000,
+                4217000,
+                4223000,
+                4230000,
+                4237000,
+                4244000,
+                4248000,
+                4251000,
+                4254000,
+                4258000,
+                4262000,
+                4266000,
+                4273000,
+                4280000,
+                4284000,
+                4287000,
+                4294000,
+                4299000,
+                4301000
               ],
               "values": [
                 249,
@@ -2886,424 +2886,424 @@
               {
                 "times": [
                   0,
-                  10,
-                  20,
-                  30,
-                  40,
-                  50,
-                  60,
-                  70,
-                  80,
-                  90,
-                  100,
-                  110,
-                  120,
-                  130,
-                  140,
-                  150,
-                  160,
-                  170,
-                  180,
-                  190,
-                  200,
-                  210,
-                  220,
-                  230,
-                  240,
-                  250,
-                  260,
-                  270,
-                  280,
-                  290,
-                  300,
-                  310,
-                  320,
-                  330,
-                  340,
-                  350,
-                  360,
-                  370,
-                  380,
-                  390,
-                  400,
-                  410,
-                  420,
-                  430,
-                  440,
-                  450,
-                  460,
-                  470,
-                  480,
-                  490,
-                  500,
-                  510,
-                  520,
-                  530,
-                  540,
-                  550,
-                  560,
-                  570,
-                  580,
-                  590,
-                  600,
-                  610,
-                  620,
-                  630,
-                  640,
-                  650,
-                  660,
-                  670,
-                  680,
-                  690,
-                  700,
-                  710,
-                  720,
-                  730,
-                  740,
-                  750,
-                  760,
-                  770,
-                  780,
-                  790,
-                  800,
-                  810,
-                  820,
-                  830,
-                  840,
-                  850,
-                  860,
-                  870,
-                  880,
-                  890,
-                  900,
-                  910,
-                  920,
-                  930,
-                  940,
-                  950,
-                  960,
-                  970,
-                  980,
-                  990,
-                  1000,
-                  1010,
-                  1020,
-                  1030,
-                  1040,
-                  1050,
-                  1060,
-                  1070,
-                  1080,
-                  1090,
-                  1100,
-                  1110,
-                  1120,
-                  1130,
-                  1140,
-                  1150,
-                  1160,
-                  1170,
-                  1180,
-                  1190,
-                  1200,
-                  1210,
-                  1220,
-                  1230,
-                  1240,
-                  1250,
-                  1260,
-                  1270,
-                  1280,
-                  1290,
-                  1300,
-                  1310,
-                  1320,
-                  1330,
-                  1340,
-                  1350,
-                  1360,
-                  1370,
-                  1380,
-                  1390,
-                  1400,
-                  1410,
-                  1420,
-                  1430,
-                  1440,
-                  1450,
-                  1460,
-                  1470,
-                  1480,
-                  1490,
-                  1500,
-                  1510,
-                  1520,
-                  1530,
-                  1540,
-                  1550,
-                  1560,
-                  1570,
-                  1580,
-                  1590,
-                  1600,
-                  1610,
-                  1620,
-                  1630,
-                  1640,
-                  1650,
-                  1660,
-                  1670,
-                  1680,
-                  1690,
-                  1700,
-                  1710,
-                  1720,
-                  1730,
-                  1740,
-                  1750,
-                  1760,
-                  1770,
-                  1780,
-                  1790,
-                  1800,
-                  1810,
-                  1820,
-                  1830,
-                  1840,
-                  1850,
-                  1860,
-                  1870,
-                  1880,
-                  1890,
-                  1900,
-                  1910,
-                  1920,
-                  1930,
-                  1940,
-                  1950,
-                  1960,
-                  1970,
-                  1980,
-                  1990,
-                  2000,
-                  2010,
-                  2020,
-                  2030,
-                  2040,
-                  2050,
-                  2060,
-                  2070,
-                  2080,
-                  2090,
-                  2100,
-                  2110,
-                  2120,
-                  2130,
-                  2140,
-                  2150,
-                  2160,
-                  2170,
-                  2180,
-                  2190,
-                  2200,
-                  2210,
-                  2220,
-                  2230,
-                  2240,
-                  2250,
-                  2260,
-                  2270,
-                  2280,
-                  2290,
-                  2300,
-                  2310,
-                  2320,
-                  2330,
-                  2340,
-                  2350,
-                  2360,
-                  2370,
-                  2380,
-                  2390,
-                  2400,
-                  2410,
-                  2420,
-                  2430,
-                  2440,
-                  2450,
-                  2460,
-                  2480,
-                  2490,
-                  2500,
-                  2510,
-                  2520,
-                  2530,
-                  2540,
-                  2550,
-                  2560,
-                  2570,
-                  2580,
-                  2590,
-                  2600,
-                  2610,
-                  2620,
-                  2630,
-                  2650,
-                  2660,
-                  2670,
-                  2680,
-                  2690,
-                  2700,
-                  2710,
-                  2720,
-                  2730,
-                  2740,
-                  2750,
-                  2760,
-                  2770,
-                  2780,
-                  2790,
-                  2800,
-                  2810,
-                  2820,
-                  2830,
-                  2840,
-                  2850,
-                  2860,
-                  2870,
-                  2880,
-                  2890,
-                  2900,
-                  2910,
-                  2920,
-                  2930,
-                  2940,
-                  2950,
-                  2960,
-                  2970,
-                  2980,
-                  2990,
-                  3000,
-                  3010,
-                  3020,
-                  3030,
-                  3040,
-                  3070,
-                  3080,
-                  3090,
-                  3100,
-                  3110,
-                  3120,
-                  3130,
-                  3140,
-                  3150,
-                  3160,
-                  3170,
-                  3180,
-                  3190,
-                  3200,
-                  3210,
-                  3220,
-                  3230,
-                  3240,
-                  3250,
-                  3260,
-                  3270,
-                  3280,
-                  3290,
-                  3300,
-                  3310,
-                  3320,
-                  3330,
-                  3340,
-                  3350,
-                  3360,
-                  3370,
-                  3380,
-                  3390,
-                  3400,
-                  3410,
-                  3420,
-                  3430,
-                  3440,
-                  3450,
-                  3470,
-                  3480,
-                  3490,
-                  3500,
-                  3510,
-                  3520,
-                  3530,
-                  3540,
-                  3550,
-                  3560,
-                  3570,
-                  3580,
-                  3590,
-                  3600,
-                  3610,
-                  3620,
-                  3630,
-                  3640,
-                  3650,
-                  3660,
-                  3670,
-                  3680,
-                  3690,
-                  3700,
-                  3710,
-                  3720,
-                  3730,
-                  3740,
-                  3750,
-                  3760,
-                  3770,
-                  3780,
-                  3790,
-                  3800,
-                  3810,
-                  3820,
-                  3830,
-                  3840,
-                  3850,
-                  3860,
-                  3870,
-                  3880,
-                  3890,
-                  3900,
-                  3910,
-                  3920,
-                  3930,
-                  3940,
-                  3950,
-                  3960,
-                  3970,
-                  3980,
-                  3990,
-                  4000,
-                  4010,
-                  4020,
-                  4030,
-                  4040,
-                  4050,
-                  4060,
-                  4070,
-                  4080,
-                  4090,
-                  4110,
-                  4120,
-                  4130,
-                  4140,
-                  4150,
-                  4160,
-                  4170,
-                  4180,
-                  4200,
-                  4230,
-                  4240,
-                  4280,
-                  4290,
-                  4300
+                  10000,
+                  20000,
+                  30000,
+                  40000,
+                  50000,
+                  60000,
+                  70000,
+                  80000,
+                  90000,
+                  100000,
+                  110000,
+                  120000,
+                  130000,
+                  140000,
+                  150000,
+                  160000,
+                  170000,
+                  180000,
+                  190000,
+                  200000,
+                  210000,
+                  220000,
+                  230000,
+                  240000,
+                  250000,
+                  260000,
+                  270000,
+                  280000,
+                  290000,
+                  300000,
+                  310000,
+                  320000,
+                  330000,
+                  340000,
+                  350000,
+                  360000,
+                  370000,
+                  380000,
+                  390000,
+                  400000,
+                  410000,
+                  420000,
+                  430000,
+                  440000,
+                  450000,
+                  460000,
+                  470000,
+                  480000,
+                  490000,
+                  500000,
+                  510000,
+                  520000,
+                  530000,
+                  540000,
+                  550000,
+                  560000,
+                  570000,
+                  580000,
+                  590000,
+                  600000,
+                  610000,
+                  620000,
+                  630000,
+                  640000,
+                  650000,
+                  660000,
+                  670000,
+                  680000,
+                  690000,
+                  700000,
+                  710000,
+                  720000,
+                  730000,
+                  740000,
+                  750000,
+                  760000,
+                  770000,
+                  780000,
+                  790000,
+                  800000,
+                  810000,
+                  820000,
+                  830000,
+                  840000,
+                  850000,
+                  860000,
+                  870000,
+                  880000,
+                  890000,
+                  900000,
+                  910000,
+                  920000,
+                  930000,
+                  940000,
+                  950000,
+                  960000,
+                  970000,
+                  980000,
+                  990000,
+                  1000000,
+                  1010000,
+                  1020000,
+                  1030000,
+                  1040000,
+                  1050000,
+                  1060000,
+                  1070000,
+                  1080000,
+                  1090000,
+                  1100000,
+                  1110000,
+                  1120000,
+                  1130000,
+                  1140000,
+                  1150000,
+                  1160000,
+                  1170000,
+                  1180000,
+                  1190000,
+                  1200000,
+                  1210000,
+                  1220000,
+                  1230000,
+                  1240000,
+                  1250000,
+                  1260000,
+                  1270000,
+                  1280000,
+                  1290000,
+                  1300000,
+                  1310000,
+                  1320000,
+                  1330000,
+                  1340000,
+                  1350000,
+                  1360000,
+                  1370000,
+                  1380000,
+                  1390000,
+                  1400000,
+                  1410000,
+                  1420000,
+                  1430000,
+                  1440000,
+                  1450000,
+                  1460000,
+                  1470000,
+                  1480000,
+                  1490000,
+                  1500000,
+                  1510000,
+                  1520000,
+                  1530000,
+                  1540000,
+                  1550000,
+                  1560000,
+                  1570000,
+                  1580000,
+                  1590000,
+                  1600000,
+                  1610000,
+                  1620000,
+                  1630000,
+                  1640000,
+                  1650000,
+                  1660000,
+                  1670000,
+                  1680000,
+                  1690000,
+                  1700000,
+                  1710000,
+                  1720000,
+                  1730000,
+                  1740000,
+                  1750000,
+                  1760000,
+                  1770000,
+                  1780000,
+                  1790000,
+                  1800000,
+                  1810000,
+                  1820000,
+                  1830000,
+                  1840000,
+                  1850000,
+                  1860000,
+                  1870000,
+                  1880000,
+                  1890000,
+                  1900000,
+                  1910000,
+                  1920000,
+                  1930000,
+                  1940000,
+                  1950000,
+                  1960000,
+                  1970000,
+                  1980000,
+                  1990000,
+                  2000000,
+                  2010000,
+                  2020000,
+                  2030000,
+                  2040000,
+                  2050000,
+                  2060000,
+                  2070000,
+                  2080000,
+                  2090000,
+                  2100000,
+                  2110000,
+                  2120000,
+                  2130000,
+                  2140000,
+                  2150000,
+                  2160000,
+                  2170000,
+                  2180000,
+                  2190000,
+                  2200000,
+                  2210000,
+                  2220000,
+                  2230000,
+                  2240000,
+                  2250000,
+                  2260000,
+                  2270000,
+                  2280000,
+                  2290000,
+                  2300000,
+                  2310000,
+                  2320000,
+                  2330000,
+                  2340000,
+                  2350000,
+                  2360000,
+                  2370000,
+                  2380000,
+                  2390000,
+                  2400000,
+                  2410000,
+                  2420000,
+                  2430000,
+                  2440000,
+                  2450000,
+                  2460000,
+                  2480000,
+                  2490000,
+                  2500000,
+                  2510000,
+                  2520000,
+                  2530000,
+                  2540000,
+                  2550000,
+                  2560000,
+                  2570000,
+                  2580000,
+                  2590000,
+                  2600000,
+                  2610000,
+                  2620000,
+                  2630000,
+                  2650000,
+                  2660000,
+                  2670000,
+                  2680000,
+                  2690000,
+                  2700000,
+                  2710000,
+                  2720000,
+                  2730000,
+                  2740000,
+                  2750000,
+                  2760000,
+                  2770000,
+                  2780000,
+                  2790000,
+                  2800000,
+                  2810000,
+                  2820000,
+                  2830000,
+                  2840000,
+                  2850000,
+                  2860000,
+                  2870000,
+                  2880000,
+                  2890000,
+                  2900000,
+                  2910000,
+                  2920000,
+                  2930000,
+                  2940000,
+                  2950000,
+                  2960000,
+                  2970000,
+                  2980000,
+                  2990000,
+                  3000000,
+                  3010000,
+                  3020000,
+                  3030000,
+                  3040000,
+                  3070000,
+                  3080000,
+                  3090000,
+                  3100000,
+                  3110000,
+                  3120000,
+                  3130000,
+                  3140000,
+                  3150000,
+                  3160000,
+                  3170000,
+                  3180000,
+                  3190000,
+                  3200000,
+                  3210000,
+                  3220000,
+                  3230000,
+                  3240000,
+                  3250000,
+                  3260000,
+                  3270000,
+                  3280000,
+                  3290000,
+                  3300000,
+                  3310000,
+                  3320000,
+                  3330000,
+                  3340000,
+                  3350000,
+                  3360000,
+                  3370000,
+                  3380000,
+                  3390000,
+                  3400000,
+                  3410000,
+                  3420000,
+                  3430000,
+                  3440000,
+                  3450000,
+                  3470000,
+                  3480000,
+                  3490000,
+                  3500000,
+                  3510000,
+                  3520000,
+                  3530000,
+                  3540000,
+                  3550000,
+                  3560000,
+                  3570000,
+                  3580000,
+                  3590000,
+                  3600000,
+                  3610000,
+                  3620000,
+                  3630000,
+                  3640000,
+                  3650000,
+                  3660000,
+                  3670000,
+                  3680000,
+                  3690000,
+                  3700000,
+                  3710000,
+                  3720000,
+                  3730000,
+                  3740000,
+                  3750000,
+                  3760000,
+                  3770000,
+                  3780000,
+                  3790000,
+                  3800000,
+                  3810000,
+                  3820000,
+                  3830000,
+                  3840000,
+                  3850000,
+                  3860000,
+                  3870000,
+                  3880000,
+                  3890000,
+                  3900000,
+                  3910000,
+                  3920000,
+                  3930000,
+                  3940000,
+                  3950000,
+                  3960000,
+                  3970000,
+                  3980000,
+                  3990000,
+                  4000000,
+                  4010000,
+                  4020000,
+                  4030000,
+                  4040000,
+                  4050000,
+                  4060000,
+                  4070000,
+                  4080000,
+                  4090000,
+                  4110000,
+                  4120000,
+                  4130000,
+                  4140000,
+                  4150000,
+                  4160000,
+                  4170000,
+                  4180000,
+                  4200000,
+                  4230000,
+                  4240000,
+                  4280000,
+                  4290000,
+                  4300000
                 ],
                 "values": [
                   2116,
@@ -3736,11 +3736,11 @@
                 "gas_number": 0
               },
               {
-                "time": 497,
+                "time": 497000,
                 "label": "NoDecoTime"
               },
               {
-                "time": 2075,
+                "time": 2075000,
                 "type": "gas_switch",
                 "gas_number": 1
               }
@@ -4200,5 +4200,10 @@
       "notes": "",
       "created_at": "2026-08-10T15:07:17.158668Z"
     }
-  ]
+  ],
+  "extensions": {
+    "opendiving": {
+      "profile_axis": "milliseconds"
+    }
+  }
 }
diff --git a/fixtures/valid/technical-dive.divejson b/fixtures/valid/technical-dive.divejson
index 4a51ff6..83a1e88 100644
--- a/fixtures/valid/technical-dive.divejson
+++ b/fixtures/valid/technical-dive.divejson
@@ -44,11 +44,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -77,7 +72,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -88,7 +83,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -99,7 +94,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -110,7 +105,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -133,21 +128,27 @@
             "gf_low": 30,
             "gf_high": 70
           },
+          "salinity": "en13319",
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -165,12 +166,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -184,8 +185,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -197,8 +198,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -210,8 +211,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -222,8 +223,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -233,8 +234,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -246,16 +247,16 @@
             "ndl": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 5940,
@@ -273,14 +274,14 @@
             },
             "tts": {
               "times": [
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000
               ],
               "values": [
                 900,
@@ -296,16 +297,16 @@
             "ppo2": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 18,
@@ -324,16 +325,16 @@
             "cns": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 45,
@@ -352,16 +353,16 @@
             "gradient_factor": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -380,16 +381,16 @@
             "surface_gradient_factor": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -412,29 +413,29 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               },
               {
-                "time": 5605,
+                "time": 5605000,
                 "type": "bookmark",
                 "label": "Surface marker"
               }
@@ -469,6 +470,16 @@
         }
       ],
       "notes": "Converted from a legacy log: no offset, no duration recorded."
+    },
+    {
+      "uuid": "0198a6f0-1111-7012-8000-000000000012",
+      "started_at": "2026-07-05",
+      "duration": 2880,
+      "max_depth": 21.5,
+      "site_uuids": [
+        "0198a6f0-1111-7040-8000-000000000040"
+      ],
+      "notes": "Logged by hand on the boat: the day, and no time of day."
     }
   ],
   "trips": [
@@ -686,6 +697,12 @@
         "sha256": "b4f1c2d4e5b697887960a1b2c3d4e5f60718293a4b5c6d7e8f9012345678abce"
       },
       "created_at": "2025-03-15T09:00:00+13:00"
+    },
+    {
+      "uuid": "0198a6f0-1111-7083-8000-000000000083",
+      "agency": "aida",
+      "name": "AIDA 2 Freediver",
+      "certified_on": "2024-11-09"
     }
   ],
   "extensions": {
diff --git a/fixtures/valid/two-computers.divejson b/fixtures/valid/two-computers.divejson
index f19b101..5ccf872 100644
--- a/fixtures/valid/two-computers.divejson
+++ b/fixtures/valid/two-computers.divejson
@@ -48,6 +48,11 @@
             "name": "Suunto Fused RGBM 2",
             "conservatism": -1
           },
+          "surface_pressure": 1.012,
+          "cns_start": 0.0,
+          "cns_end": 9.0,
+          "otu_start": 0.0,
+          "otu_end": 22.0,
           "source_files": [
             {
               "uuid": "0198a6f0-2222-7120-8000-000000000120",
@@ -75,16 +80,16 @@
             }
           ],
           "profile": {
-            "duration": 3473,
+            "duration": 3473000,
             "depth": {
               "times": [
                 0,
-                60,
-                210,
-                240,
-                1800,
-                3000,
-                3473
+                60000,
+                210000,
+                240000,
+                1800000,
+                3000000,
+                3473000
               ],
               "values": [
                 0,
@@ -99,7 +104,7 @@
             "temperature": {
               "times": [
                 0,
-                1800
+                1800000
               ],
               "values": [
                 281,
@@ -110,8 +115,8 @@
               {
                 "times": [
                   0,
-                  1800,
-                  3400
+                  1800000,
+                  3400000
                 ],
                 "values": [
                   2073,
@@ -138,15 +143,16 @@
           },
           "mode": "gauge",
           "started_at": "2026-09-08T15:18:10.000+03:00",
+          "surface_pressure": 1.009,
           "profile": {
-            "duration": 2940,
+            "duration": 2940000,
             "depth": {
               "times": [
                 0,
-                60,
-                180,
-                1770,
-                2940
+                60000,
+                180000,
+                1770000,
+                2940000
               ],
               "values": [
                 0,
@@ -159,7 +165,7 @@
             "temperature": {
               "times": [
                 0,
-                1770
+                1770000
               ],
               "values": [
                 280,
diff --git a/fixtures/write/uddf/opendiving.divejson b/fixtures/write/uddf/opendiving.divejson
index 0af595e..6930767 100644
--- a/fixtures/write/uddf/opendiving.divejson
+++ b/fixtures/write/uddf/opendiving.divejson
@@ -31,7 +31,6 @@
       "visibility": 20.0,
       "weight": 6.0,
       "altitude": 0,
-      "surface_pressure": 1.013,
       "trip_uuid": "0198a6f0-4444-7001-8000-000000000001",
       "site_uuids": [
         "0198a6f0-3333-7001-8000-000000000001"
@@ -48,7 +47,7 @@
           "end_pressure": 60.0,
           "oxygen": 21.0,
           "helium": 0.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 0
         },
         {
@@ -57,7 +56,7 @@
           "end_pressure": 150.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 1
         }
       ],
@@ -70,16 +69,17 @@
             "name": "Ocean",
             "dive_number": 118
           },
+          "surface_pressure": 1.013,
           "profile": {
-            "duration": 2880,
+            "duration": 2880000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                2400,
-                2700,
-                2880
+                120000,
+                600000,
+                2400000,
+                2700000,
+                2880000
               ],
               "values": [
                 0,
@@ -93,8 +93,8 @@
             "temperature": {
               "times": [
                 0,
-                120,
-                600
+                120000,
+                600000
               ],
               "values": [
                 244,
@@ -106,9 +106,9 @@
               {
                 "times": [
                   0,
-                  120,
-                  600,
-                  2880
+                  120000,
+                  600000,
+                  2880000
                 ],
                 "values": [
                   2100,
@@ -120,8 +120,8 @@
               },
               {
                 "times": [
-                  2400,
-                  2700
+                  2400000,
+                  2700000
                 ],
                 "values": [
                   2000,
@@ -137,16 +137,16 @@
                 "gas_number": 0
               },
               {
-                "time": 600,
+                "time": 600000,
                 "label": "Deepest point"
               },
               {
-                "time": 2400,
+                "time": 2400000,
                 "type": "gas_switch",
                 "gas_number": 1
               },
               {
-                "time": 2700,
+                "time": 2700000,
                 "type": "safety_stop"
               }
             ]
diff --git a/fixtures/write/uddf/technical-dive.divejson b/fixtures/write/uddf/technical-dive.divejson
index 4a51ff6..83a1e88 100644
--- a/fixtures/write/uddf/technical-dive.divejson
+++ b/fixtures/write/uddf/technical-dive.divejson
@@ -44,11 +44,6 @@
       "weight": 0,
       "water_type": "salt",
       "altitude": 0,
-      "cns_start": 4.5,
-      "cns_end": 61.0,
-      "otu_start": 0,
-      "otu_end": 88.5,
-      "surface_pressure": 1.013,
       "entry_position": {
         "latitude": -45.86055,
         "longitude": 170.66973
@@ -77,7 +72,7 @@
           "end_pressure": 80.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 1,
           "role": "bottom",
           "usage": "parallel"
@@ -88,7 +83,7 @@
           "end_pressure": 95.0,
           "oxygen": 18.0,
           "helium": 45.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 2,
           "role": "bottom",
           "usage": "parallel"
@@ -99,7 +94,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 3,
           "role": "deco",
           "usage": "staged"
@@ -110,7 +105,7 @@
           "end_pressure": 0.0,
           "oxygen": 100.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 4,
           "role": "oxygen",
           "usage": "staged"
@@ -133,21 +128,27 @@
             "gf_low": 30,
             "gf_high": 70
           },
+          "salinity": "en13319",
+          "surface_pressure": 1.013,
+          "cns_start": 4.5,
+          "cns_end": 61.0,
+          "otu_start": 0,
+          "otu_end": 88.5,
           "profile": {
-            "duration": 5520,
+            "duration": 5520000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -165,12 +166,12 @@
             },
             "ceiling": {
               "times": [
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000
               ],
               "values": [
                 1800,
@@ -184,8 +185,8 @@
             "temperature": {
               "times": [
                 0,
-                1500,
-                5400
+                1500000,
+                5400000
               ],
               "values": [
                 162,
@@ -197,8 +198,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2200,
@@ -210,8 +211,8 @@
               {
                 "times": [
                   0,
-                  2400,
-                  5400
+                  2400000,
+                  5400000
                 ],
                 "values": [
                   2180,
@@ -222,8 +223,8 @@
               },
               {
                 "times": [
-                  3000,
-                  4200
+                  3000000,
+                  4200000
                 ],
                 "values": [
                   2000,
@@ -233,8 +234,8 @@
               },
               {
                 "times": [
-                  4200,
-                  5400
+                  4200000,
+                  5400000
                 ],
                 "values": [
                   1950,
@@ -246,16 +247,16 @@
             "ndl": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 5940,
@@ -273,14 +274,14 @@
             },
             "tts": {
               "times": [
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000
               ],
               "values": [
                 900,
@@ -296,16 +297,16 @@
             "ppo2": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 18,
@@ -324,16 +325,16 @@
             "cns": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 45,
@@ -352,16 +353,16 @@
             "gradient_factor": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -380,16 +381,16 @@
             "surface_gradient_factor": {
               "times": [
                 0,
-                120,
-                600,
-                1500,
-                2400,
-                3000,
-                3600,
-                4200,
-                4800,
-                5400,
-                5520
+                120000,
+                600000,
+                1500000,
+                2400000,
+                3000000,
+                3600000,
+                4200000,
+                4800000,
+                5400000,
+                5520000
               ],
               "values": [
                 0,
@@ -412,29 +413,29 @@
                 "gas_number": 1
               },
               {
-                "time": 2980,
+                "time": 2980000,
                 "type": "deep_stop"
               },
               {
-                "time": 3005,
+                "time": 3005000,
                 "type": "gas_switch",
                 "gas_number": 3
               },
               {
-                "time": 4210,
+                "time": 4210000,
                 "type": "gas_switch",
                 "gas_number": 4
               },
               {
-                "time": 5100,
+                "time": 5100000,
                 "type": "safety_stop"
               },
               {
-                "time": 5200,
+                "time": 5200000,
                 "label": "Tissue ceiling cleared"
               },
               {
-                "time": 5605,
+                "time": 5605000,
                 "type": "bookmark",
                 "label": "Surface marker"
               }
@@ -469,6 +470,16 @@
         }
       ],
       "notes": "Converted from a legacy log: no offset, no duration recorded."
+    },
+    {
+      "uuid": "0198a6f0-1111-7012-8000-000000000012",
+      "started_at": "2026-07-05",
+      "duration": 2880,
+      "max_depth": 21.5,
+      "site_uuids": [
+        "0198a6f0-1111-7040-8000-000000000040"
+      ],
+      "notes": "Logged by hand on the boat: the day, and no time of day."
     }
   ],
   "trips": [
@@ -686,6 +697,12 @@
         "sha256": "b4f1c2d4e5b697887960a1b2c3d4e5f60718293a4b5c6d7e8f9012345678abce"
       },
       "created_at": "2025-03-15T09:00:00+13:00"
+    },
+    {
+      "uuid": "0198a6f0-1111-7083-8000-000000000083",
+      "agency": "aida",
+      "name": "AIDA 2 Freediver",
+      "certified_on": "2024-11-09"
     }
   ],
   "extensions": {
diff --git a/schema/1.0/divejson.schema.json b/schema/1.0/divejson.schema.json
index d4be143..6e3c9bb 100644
--- a/schema/1.0/divejson.schema.json
+++ b/schema/1.0/divejson.schema.json
@@ -50,8 +50,7 @@
       "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}$"
     },
     "notes": {
-      "type": "string",
-      "maxLength": 10000
+      "type": "string"
     },
     "extensions": {
       "type": "object",
@@ -133,7 +132,9 @@
       "properties": {
         "uuid": { "$ref": "#/$defs/uuid" },
         "number": { "type": "integer" },
-        "started_at": { "$ref": "#/$defs/date_time" },
+        "started_at": {
+          "anyOf": [{ "$ref": "#/$defs/date_time" }, { "$ref": "#/$defs/date" }]
+        },
         "duration": { "type": "integer", "exclusiveMinimum": 0 },
         "notes": { "$ref": "#/$defs/notes" },
         "max_depth": { "type": "number", "exclusiveMinimum": 0 },
@@ -141,13 +142,8 @@
         "bottom_temperature": { "type": "number" },
         "visibility": { "type": "number", "minimum": 0 },
         "weight": { "type": "number", "minimum": 0 },
-        "water_type": { "enum": ["salt", "fresh", "brackish", "en13319"] },
+        "water_type": { "enum": ["salt", "fresh", "brackish"] },
         "altitude": { "type": "integer", "minimum": -450, "maximum": 6500 },
-        "cns_start": { "type": "number", "minimum": 0 },
-        "cns_end": { "type": "number", "minimum": 0 },
-        "otu_start": { "type": "number", "minimum": 0 },
-        "otu_end": { "type": "number", "minimum": 0 },
-        "surface_pressure": { "type": "number", "minimum": 0.4, "maximum": 1.2 },
         "entry_position": { "$ref": "#/$defs/position" },
         "exit_position": { "$ref": "#/$defs/position" },
         "trip_uuid": { "$ref": "#/$defs/uuid" },
@@ -171,7 +167,7 @@
         "end_pressure": { "type": "number", "minimum": 0, "maximum": 350 },
         "oxygen": { "type": "number", "minimum": 0, "maximum": 100 },
         "helium": { "type": "number", "minimum": 0, "maximum": 100 },
-        "po2_limit": { "type": "number", "minimum": 0.4, "maximum": 2.0 },
+        "ppo2_limit": { "type": "number", "minimum": 0.4, "maximum": 2.0 },
         "gas_number": { "type": "integer", "minimum": 0 },
         "role": { "enum": ["bottom", "deco", "diluent", "oxygen"] },
         "usage": { "enum": ["parallel", "staged"] },
@@ -185,7 +181,13 @@
         "device": { "$ref": "#/$defs/device" },
         "mode": { "enum": ["open_circuit", "closed_circuit", "semi_closed", "gauge", "freedive"] },
         "deco_model": { "$ref": "#/$defs/deco_model" },
+        "salinity": { "enum": ["fresh", "en13319", "salt"] },
         "started_at": { "$ref": "#/$defs/date_time" },
+        "surface_pressure": { "type": "number", "minimum": 0.4, "maximum": 1.2 },
+        "cns_start": { "type": "number", "minimum": 0 },
+        "cns_end": { "type": "number", "minimum": 0 },
+        "otu_start": { "type": "number", "minimum": 0 },
+        "otu_end": { "type": "number", "minimum": 0 },
         "source_files": { "type": "array", "items": { "$ref": "#/$defs/stored_file" } },
         "profile": { "$ref": "#/$defs/profile" },
         "extensions": { "$ref": "#/$defs/extensions" }
@@ -356,7 +358,9 @@
           "enum": [
             "padi", "ssi", "naui", "sdi", "tdi", "cmas", "raid", "bsac",
             "gue", "iantd", "psai", "dan", "efr", "andi", "snsi", "acuc",
-            "pss", "ida", "other"
+            "pss", "ida", "ndl", "utd", "saa", "scotsac", "iac", "protec",
+            "pdic", "nase", "sei", "ymca", "erdi", "aida", "molchanovs", "pfi",
+            "apnea_academy", "fii", "nss_cds", "nacd", "idea", "diwa", "other"
           ]
         },
         "agency_other": { "type": "string", "minLength": 1, "maxLength": 64 },
@@ -513,7 +517,9 @@
           "enum": [
             "padi", "ssi", "naui", "sdi", "tdi", "cmas", "raid", "bsac",
             "gue", "iantd", "psai", "dan", "efr", "andi", "snsi", "acuc",
-            "pss", "ida", "other"
+            "pss", "ida", "ndl", "utd", "saa", "scotsac", "iac", "protec",
+            "pdic", "nase", "sei", "ymca", "erdi", "aida", "molchanovs", "pfi",
+            "apnea_academy", "fii", "nss_cds", "nacd", "idea", "diwa", "other"
           ]
         },
         "agency_other": { "type": "string", "minLength": 1, "maxLength": 64 },

From 1173b99dcac04ace26f09c7bb9679fca91325873 Mon Sep 17 00:00:00 2001
From: Aleksei Vesnin <aleksei@vesnin.me>
Date: Thu, 24 Sep 2026 22:54:03 +0300
Subject: [PATCH 2/9] Milliseconds on the axis, readouts on the recording, a
 date-only start, and the widened vocabularies

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 CHANGELOG.md                       |  48 +++++++
 README.md                          |  17 ++-
 divejson/converter.py              | 196 +++++++++++++++++++++++------
 divejson/fit.py                    | 126 +++++++++++--------
 divejson/series.py                 |  66 +++++-----
 divejson/ssrf.py                   |  66 +++++++---
 divejson/suunto_json.py            | 144 +++++++++++----------
 divejson/suunto_xml.py             |  81 ++++++------
 divejson/uddf.py                   | 177 +++++++++++++++-----------
 divejson/uddf_write.py             | 124 ++++++++++--------
 divejson/validate.py               |  64 ++++++----
 tests/helpers.py                   |  24 ++++
 tests/test_converter.py            | 124 ++++++++++++++++--
 tests/test_fit_fixtures.py         |   4 +-
 tests/test_fit_parsing.py          |  63 +++++++---
 tests/test_fit_units.py            |   2 +-
 tests/test_series.py               |  29 ++++-
 tests/test_ssrf_fixtures.py        |   9 +-
 tests/test_ssrf_parsing.py         |  87 ++++++++++++-
 tests/test_ssrf_units.py           |  17 ++-
 tests/test_suunto_json_fixtures.py |  41 +++---
 tests/test_suunto_json_parsing.py  |  56 ++++++---
 tests/test_suunto_json_units.py    |  25 ++--
 tests/test_suunto_xml_fixtures.py  |   2 +-
 tests/test_suunto_xml_parsing.py   |  39 ++++--
 tests/test_suunto_xml_units.py     |  16 +--
 tests/test_uddf_parsing.py         | 139 ++++++++++++++++----
 tests/test_uddf_units.py           |   7 +-
 tests/test_uddf_write_fixtures.py  |  17 +--
 tests/test_uddf_writing.py         | 165 ++++++++++++++++--------
 tests/test_validate.py             |  79 +++++++++++-
 31 files changed, 1446 insertions(+), 608 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f1e27f..adb845f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,54 @@ this file is about the package, whose version moves independently.
 
 ## Unreleased
 
+- **Breaking: the profile axis is milliseconds.** §5.1 of
+  [the specification](https://github.com/divejson/divejson/blob/main/spec/divejson.md) puts a
+  Series' `times`, a profile's `duration` and an event's `time` in milliseconds, where a
+  dive's own `duration` and the `ndl` and `tts` readings stay seconds. Every reader multiplies
+  its source's seconds by a thousand before rounding, so a fraction the source states keeps
+  its place — a Suunto app export's first depth lands at 160 rather than 0 — and two readings
+  collide only on one millisecond: `<DIVETIME>30</DIVETIME>` and `<DIVETIME>30.4</DIVETIME>`
+  are two samples now. The members keep their names and types, so a document written in
+  seconds still validates and reads a thousand times short; this package's converters wrote
+  every such document up to this release. The UDDF writer puts `<divetime>` back in seconds
+  with a fraction only where the millisecond is not a whole second. Report lines still speak
+  seconds (`converter.in_seconds`), and `converter.milliseconds` is the one factor.
+
+- **Breaking: a device's readouts and its salinity sit on the recording.**
+  `surface_pressure`, `cns_start`, `cns_end`, `otu_start` and `otu_end` move from the dive to
+  §6.4a's recording, and `divejson validate` refuses them on a dive as undefined members.
+  Each reader puts them on the recording its file produced; a figure a source states once
+  for the whole dive — UDDF's `<surfacepressure>`, Subsurface's `@cns` and `@otu` — goes to
+  the primary recording, reported `resolved` where the dive has more than one, and is a
+  recording of its own where it has none, a readout now satisfying §3 rule 4 on its own. FIT's
+  `dive_settings.water_type` is the recording's `salinity`, and the dive's `water_type` loses
+  `en13319`. The UDDF writer takes `<surfacepressure>` from the primary recording and reports
+  a recording's salinity and oxygen clocks dropped. `converter.recording` takes `salinity` and
+  `readouts`; `converter.onto_primary` is the dive-level rule.
+
+- **Breaking: a dive may start on a date alone.** A UDDF `<datetime>2002-06-18</datetime>` or
+  `2002-06-18T`, and a `.ssrf` `@date` with no `@time`, read as the bare date with the time of
+  day reported absent, where they read as midnight. `divejson validate` accepts a date in a
+  dive's `started_at` and nowhere else. The UDDF writer writes it back as the bare date with
+  no report, which the UDDF XSD's `xs:dateTime` refuses; the suite's XSD pass widens that one
+  element's spelling for itself alone.
+
+- **Breaking: `po2_limit` is `ppo2_limit`**, the name of the quantity §6.4's `ppo2` channel
+  samples. The readers write the new name, the writer reads it, and `divejson validate`
+  refuses the old one as an undefined member.
+
+- **Breaking: `notes` has no length cap.** A converter carries a note whole, where it cut one
+  at 10 000 characters and reported the rest dropped; `converter.MAX_NOTES` is gone. The
+  strings that stay bounded are names, numbers, labels and identifiers.
+
+- **`divejson validate` no longer checks member order.** §4 makes `format` first and
+  `version` second a SHOULD, so a document a generic re-serialisation sorted is conforming.
+  §3's `gf_low ≤ gf_high` is rule 6, and the converter's report says so.
+
+- **The certification and course agencies gain twenty values**, AIDA among them, arriving
+  with the schema. §5.5 now reserves the `divejson` producer key for converters following
+  `docs/converting.md`, which is where this package's converters already write.
+
 ## 0.12.0
 
 - **A diver carries a portrait.** §6.1 of
diff --git a/README.md b/README.md
index a875944..56dc4b1 100644
--- a/README.md
+++ b/README.md
@@ -30,9 +30,11 @@ divejson validate my-logbook.divejson
 
 The JSON Schema, and then the requirements the specification states in prose and a schema
 cannot — identifier uniqueness, referential closure, profile-series integrity in **every**
-recording of a dive, a recording carrying at least one of a device, a profile and its
-stored files, the member order, the UTC offset on `exported_at`. Exit status is non-zero if
-any file fails, with one line per violation.
+recording of a dive, a recording carrying at least one of a device, a profile, its stored
+files and a readout, the UTC offset on `exported_at`. The order of a document's members is
+not among them: §4 asks a writer to put `format` and `version` first, and a document that
+does not is as conforming as one that does. Exit status is non-zero if any file fails, with
+one line per violation.
 
 ## Convert a logbook into DiveJSON
 
@@ -228,8 +230,13 @@ directory now yields 384 dives where it used to yield 342.
 **What a recording carries beyond its samples.** Every reader fills §6.4a's `mode` and
 §6.4c's `deco_model` where its files state them — UDDF from `<divemode>` and the
 `<decomodel>` a dive links, FIT from `dive_settings`, the Suunto app's JSON from
-`Header.Diving`, the DM5 XML from `<Mode>` and `<PersonalMode>` — and the profile carries
-the readouts the computer *computed*, as distinct from what it measured. Which channels
+`Header.Diving`, the DM5 XML from `<Mode>` and `<PersonalMode>` — and §6.4a's readouts, the
+surface pressure and the two ends of the oxygen clocks the computer used, on the recording
+beside them rather than on the dive. A format that states a readout once for the whole dive
+— UDDF's `<surfacepressure>`, Subsurface's `@cns` and `@otu` — gives it to the primary
+recording, and reports that reading where the dive has more than one. The profile carries
+the figures the computer *computed* sample by sample, as distinct from what it measured, on
+an axis in milliseconds that keeps every sub-second offset a source states. Which channels
 those are, and in what units, is
 [§6.4 of the specification](https://github.com/divejson/divejson/blob/main/spec/divejson.md);
 which of them a given format states, and what it does with a device's absent-markers and
diff --git a/divejson/converter.py b/divejson/converter.py
index 8dcf5b7..7004082 100644
--- a/divejson/converter.py
+++ b/divejson/converter.py
@@ -10,7 +10,8 @@
 
 The sections below the policy classes carry the rest of what an adapter inherits rather
 than rewrites: `decimal_of` and its representability bound, `rounded`'s half-away-from-zero
-convention and the two §6.5 channel scales; `capped`; `Identities`; and `position`. An
+convention, the millisecond axis and the two §6.5 channel scales; `capped`; the recording
+and where a readout stated on the dive goes; `Identities`; and `position`. An
 adapter that reimplements one of these gets it subtly different, which is the failure this
 module exists to prevent — the bound and the Null Island rule were each written once for
 one format and are true of every format.
@@ -75,10 +76,10 @@
 from datetime import datetime
 from decimal import ROUND_HALF_UP, Decimal, InvalidOperation
 from functools import cache
-from typing import Any, Literal
+from typing import Any, Literal, overload
 
 from . import SPEC_VERSION, __version__
-from .validate import Issue, load_schema
+from .validate import READOUTS, Issue, load_schema
 
 __all__ = [
     "CENTIMETRES_PER_METRE",
@@ -87,8 +88,9 @@
     "MAX_MAGNITUDE",
     "MAX_MODEL_NAME",
     "MAX_NAME",
-    "MAX_NOTES",
+    "MILLISECONDS_PER_SECOND",
     "PRODUCER_KEY",
+    "READOUTS",
     "TENTHS_PER_UNIT",
     "Claimed",
     "Conversion",
@@ -112,13 +114,18 @@
     "device",
     "grouped",
     "header",
+    "in_seconds",
     "integer_of",
+    "milliseconds",
+    "onto_primary",
     "position",
     "profile_members",
     "record_inferred",
     "recorded",
     "recording",
+    "recording_members",
     "rounded",
+    "shared_readout",
     "zero_is_an_answer",
 ]
 
@@ -318,7 +325,8 @@ def validates_alone(self) -> bool:
 def header(exported_at: datetime) -> dict[str, Any]:
     """The four members every converted document opens with, in §4's order.
 
-    `format` and `version` are the two §4 requires first and second. `exported_at` and
+    `format` and `version` are the two §4 asks a writer to put first and second, so that a
+    reader may dispatch before parsing further. `exported_at` and
     `generator` are the two a converted document asserts about its own *run* rather than
     about the source, which is why `divejson.compared` drops exactly those before a
     fixture comparison.
@@ -394,8 +402,7 @@ def channel_floor(member: str) -> int | None:
 
     A channel is a `$ref` to a series definition rather than a member carrying constraints
     of its own, so `recorded` is not the question to ask about one — every call site it has
-    passes `record="dive"` or `record="cylinder"`, and `_floor` finds nothing under a
-    reference. This resolves the reference instead: the six decompression readouts share a
+    names a record's own member, and `_floor` finds nothing under a reference. This resolves the reference instead: the six decompression readouts share a
     definition whose `values` floor at zero, because no-decompression time, time to surface,
     ppO₂, CNS and a gradient factor have no negative reading and a source that writes one is
     spelling absence in the only space it had. Depth, ceiling and temperature share the
@@ -470,10 +477,17 @@ def recorded(value: Decimal | int | None, *, record: str, member: str) -> bool:
 # than zero.
 #
 # Divided by 1000, the largest factor any adapter applies to a number it has read — UDDF's
-# cubic metres to litres, and above any channel scale — so that checking the value as the
-# text is read also covers every value derived from it.
+# cubic metres to litres, every source's seconds to the profile axis's milliseconds, and
+# above any channel scale — so that checking the value as the text is read also covers
+# every value derived from it.
 MAX_MAGNITUDE = Decimal(sys.float_info.max) / 1000
 
+# §5.1's grain for elapsed time on a profile axis — a Series' `times`, a profile's
+# `duration`, an event's `time` — where a dive's own `duration` and the `ndl` and `tts`
+# readings stay seconds. Every source this package reads states its sample times in
+# seconds, whole or fractional, so this is the one factor every reader's axis applies.
+MILLISECONDS_PER_SECOND = Decimal(1000)
+
 
 def decimal_of(text: str | None) -> Decimal | None:
     """A number from source text, or `None` for anything that is not a usable one.
@@ -511,7 +525,7 @@ def rounded(value: Decimal) -> int:
     """The nearest integer, halves away from zero.
 
     Python's own `round` is half-to-even, which is the right default for statistics and the
-    wrong one for a reading: 2.5 seconds of elapsed time is 3, not 2.
+    wrong one for a reading: a sample stamped 2.5 ms in is at 3 ms, not 2.
     """
     return int(value.to_integral_value(rounding=ROUND_HALF_UP))
 
@@ -520,13 +534,40 @@ def integer_of(value: Decimal | None) -> int | None:
     return None if value is None else rounded(value)
 
 
+@overload
+def milliseconds(seconds: Decimal) -> int: ...
+@overload
+def milliseconds(seconds: None) -> None: ...
+@overload
+def milliseconds(seconds: Decimal | None) -> int | None: ...
+def milliseconds(seconds: Decimal | None) -> int | None:
+    """A source's elapsed seconds as a place on §6.5's axis, or nothing for no time at all.
+
+    Multiplied before it is rounded, which is the whole point: a fraction the source states
+    is kept to the millisecond rather than rounded away to the second, so a Suunto entry
+    160 ms after the dive began is at 160 and not at 0.
+    """
+    return None if seconds is None else rounded(seconds * MILLISECONDS_PER_SECOND)
+
+
+def in_seconds(milliseconds: int) -> str:
+    """A place on the axis as a diver reads it in a report: `1200.02`, `30`.
+
+    The report speaks seconds because that is what every source format and every dive
+    computer's display does; the document's milliseconds are an encoding, and a note saying
+    a waypoint is "at 1200020" would send a diver looking for a number their file does not
+    contain. A whole second is written as the integer it is, so a report on a file that
+    samples whole seconds reads exactly as it did before the axis moved.
+    """
+    return format((Decimal(milliseconds) / MILLISECONDS_PER_SECOND).normalize(), "f")
+
+
 # -- text ----------------------------------------------------------------------------
 
-# The two length caps every adapter meets, whatever it is reading: §6's `notes` on any
-# record, and the 255 that every REQUIRED name in §6 shares — a site's, a trip's, a gear
-# item's, a diver's. A format whose own members reach further caps them here too, and the
-# caps only that format meets stay with it.
-MAX_NOTES = 10_000
+# The length cap every adapter meets, whatever it is reading: the 255 that every REQUIRED
+# name in §6 shares — a site's, a trip's, a gear item's, a diver's. A format whose own
+# members reach further caps them here too, and the caps only that format meets stay with
+# it. A `notes` member has none: it is prose, and a converter passes it through whole.
 MAX_NAME = 255
 
 
@@ -623,7 +664,7 @@ def deco_model(
     the DM5 XML's `<PersonalMode>` — so the rules that hold across all four are here rather
     than four times over: §6.4c's member order, the name trimmed and capped with an empty
     one read as absence (§5.4), the schema's range on a gradient factor, **both or neither**
-    on the pair, **§3 rule 7's ordering**, and §6.4b's rule that an object with no members is
+    on the pair, **§3 rule 6's ordering**, and §6.4b's rule that an object with no members is
     not written at all.
 
     Every one of those is the same argument: a reading the format cannot hold resolves to an
@@ -673,7 +714,7 @@ def deco_model(
                 "dropped",
             )
     if len(pair) == 2 and pair["gf_low"] > pair["gf_high"]:
-        # §3's rule 7, which the schema cannot express and this converter's own output is
+        # §3's rule 6, which the schema cannot express and this converter's own output is
         # held to: a low above a high is a model nothing ran. **Both go**, because the file
         # does not say which of the two is the wrong one and choosing would be §5.4's guess.
         # It is dropped here rather than left to `validate_document`, which raises and takes
@@ -682,7 +723,7 @@ def deco_model(
         note(
             where,
             f"{labels.get('gf_low', 'gf_low')} is {pair['gf_low']} and "
-            f"{labels.get('gf_high', 'gf_high')} is {pair['gf_high']}, and §3 rule 7 records a low no higher "
+            f"{labels.get('gf_high', 'gf_high')} is {pair['gf_high']}, and §3 rule 6 records a low no higher "
             "than its high; both are dropped, the source not saying which of the two is wrong",
             "dropped",
         )
@@ -705,43 +746,116 @@ def deco_model(
     return built or None
 
 
+@cache
+def recording_members() -> tuple[str, ...]:
+    """§6.4a's Recording members in the section's own order, off the schema.
+
+    `profile_members`'s reason, and one of its own: a readout stated on the dive joins a
+    recording a reader has already built (`onto_primary`), and putting it back in its place
+    is a question of where the section lists it rather than of which order the members
+    happened to arrive in.
+    """
+    return tuple(load_schema()["$defs"]["recording"]["properties"])
+
+
 def recording(
     *,
     device: dict[str, Any] | None = None,
     mode: str | None = None,
     deco_model: dict[str, Any] | None = None,
+    salinity: str | None = None,
     started_at: str | None = None,
+    readouts: dict[str, float] | None = None,
     source_files: list[dict[str, Any]] | None = None,
     profile: dict[str, Any] | None = None,
 ) -> dict[str, Any] | None:
     """§6.4a's Recording in the section's member order, or nothing at all.
 
     Nothing at all is the point of the function. §3's rule 4 says a recording carries at
-    least one of `device`, `profile` and `source_files`, so a source that describes a
-    record of a dive without naming a device and without keeping a sample produces no
-    recording — and every adapter that built one anyway would emit `recordings: [{}]` and
-    fail its own output validation. `started_at` alone does not qualify: §6.4a reads an
-    absent one as the dive's, so a recording carrying only a start describes nothing the
-    dive does not already say. **`mode` and `deco_model` do not qualify either**, for the
-    same reason and for one of their own: both describe how a computer was running rather
-    than anything it recorded, and §3's rule 4 names the three members it names.
+    least one of `device`, `profile`, `source_files` and a readout, so a source that
+    describes a record of a dive without naming a device, keeping a sample or stating a
+    figure the device computed produces no recording — and every adapter that built one
+    anyway would emit `recordings: [{}]` and fail its own output validation. `started_at`
+    alone does not qualify: §6.4a reads an absent one as the dive's, so a recording carrying
+    only a start describes nothing the dive does not already say. **`mode`, `deco_model` and
+    `salinity` do not qualify either**, for the same reason and for one of their own: each
+    describes how a computer was set rather than anything it recorded, and a setting nothing
+    recorded a dive with is not a record of one.
+
+    `readouts` are the five `READOUTS` a reader found, keyed by member; a key outside them
+    raises `KeyError` rather than landing on the recording, the way `recorded` refuses a
+    member the schema does not have.
     """
-    if not (device or profile or source_files):
+    for member in readouts or {}:
+        if member not in READOUTS:
+            raise KeyError(member)
+    # `is not None` for a readout and truthiness for the rest, because a zero is a reading
+    # here — the CNS a diver's first dive of the day starts on — where an empty device or
+    # an empty file list is nothing.
+    figures = {member: value for member, value in (readouts or {}).items() if value is not None}
+    if not (device or profile or source_files or figures):
         return None
-    built: dict[str, Any] = {}
-    if device:
-        built["device"] = device
-    if mode:
-        built["mode"] = mode
-    if deco_model:
-        built["deco_model"] = deco_model
-    if started_at:
-        built["started_at"] = started_at
-    if source_files:
-        built["source_files"] = source_files
-    if profile:
-        built["profile"] = profile
-    return built
+    settings = {
+        "device": device,
+        "mode": mode,
+        "deco_model": deco_model,
+        "salinity": salinity,
+        "started_at": started_at,
+        "source_files": source_files,
+        "profile": profile,
+    }
+    return _in_order({**{member: value for member, value in settings.items() if value}, **figures})
+
+
+def _in_order(built: dict[str, Any]) -> dict[str, Any]:
+    return {member: built[member] for member in recording_members() if member in built}
+
+
+def onto_primary(
+    recordings: list[dict[str, Any]],
+    readouts: dict[str, float],
+    *,
+    note: Reporter,
+    where: str,
+    stated: str,
+) -> None:
+    """A readout the source states once for the whole **dive**, onto the recording it is.
+
+    `docs/converting.md`'s rule, for the formats that state one there — Subsurface's
+    `<dive @cns>` and `@otu`. A readout is a computer's own arithmetic (§6.4a), so it goes on
+    the recording that computer produced: the **primary**, the first, the file not saying
+    which of its computers computed it. Where the dive has more than one recording that is a
+    decision about meaning rather than about scale, reported `resolved`; where it has none,
+    the readout is a recording of its own, which §6.4a allows — a CNS figure copied off a
+    wrist into a hand-kept log is a record of the dive nothing else produces.
+
+    `stated` names the source's own spelling for the report, the way `device`'s labels do.
+    The list is changed in place.
+    """
+    if not readouts:
+        return
+    if not recordings:
+        built = recording(readouts=readouts)
+        if built is not None:
+            recordings.append(built)
+        return
+    recordings[0] = _in_order({**recordings[0], **readouts})
+    if len(recordings) > 1:
+        note(where, shared_readout(stated, len(recordings)), "resolved")
+
+
+def shared_readout(stated: str, count: int) -> str:
+    """The `resolved` line for a readout stated on a dive that has `count` recordings.
+
+    Its own function because UDDF reaches the same finding by another road — its first link
+    is the primary whether or not it names a device, so the readout goes in as that
+    recording is built rather than onto it afterwards — and one finding is one sentence.
+    """
+    return (
+        f"the dive states {stated} once and has {count} recordings, and a readout is one computer's "
+        "figure; read as the primary recording's, the file not saying which computer computed it "
+        "(spec §6.4a)"
+    )
 
 
 # -- identity ------------------------------------------------------------------------
diff --git a/divejson/fit.py b/divejson/fit.py
index 61ff2ee..7a9e0a3 100644
--- a/divejson/fit.py
+++ b/divejson/fit.py
@@ -78,6 +78,7 @@
     device,
     header,
     integer_of,
+    milliseconds,
     position,
     record_inferred,
     recorded,
@@ -166,11 +167,12 @@
 UNCARRIED_GAS_STATUSES = frozenset({"disabled"})
 
 # `dive_settings.water_type`, whose FIT enum is `{0: fresh, 1: salt, 2: en13319,
-# 3: custom}`. Three of the four are §6.2 members under the same name. `custom` is
-# deliberately absent: it says the diver dialled in a `water_density` number, which is not
-# a water type and which §6.2 has nowhere to put — so it is reported rather than rounded
-# to the nearest real water.
-WATER_TYPES = {"fresh": "fresh", "salt": "salt", "en13319": "en13319"}
+# 3: custom}`, is the density the computer was set to, so three of the four are §6.4a
+# `salinity` values under the same name and none of them is the dive's `water_type`: a
+# setting of the device is not a record of the water. `custom` is deliberately absent: it
+# says the diver dialled in a `water_density` number, which §6.4a has nowhere to put — so it
+# is reported rather than rounded to the nearest named setting.
+SALINITIES = {"fresh": "fresh", "salt": "salt", "en13319": "en13319"}
 
 # `event.event` values that describe the dive, and the §6.5 event type each becomes. A
 # table rather than a cast: this is Garmin's vocabulary, and the other 43 members of its
@@ -303,12 +305,12 @@ class _Point:
     messages of which 431 carry a depth and 4,294 a temperature — and a transmitter's
     `tank_update` is a message of its own at its own instant. They are collected onto one
     instant here so that the §6.5 axis is built once, and so that a `record` and a
-    `tank_update` at one second are one sample rather than two, the later of which the
+    `tank_update` at one timestamp are one sample rather than two, the later of which the
     axis would drop.
 
     `eq=False` so a point stays hashable and compares by identity. A dataclass that
     generates `__eq__` sets `__hash__` to `None`, and these are used as dictionary keys —
-    an event finds its second by looking its own instant's point up in the axis. Identity
+    an event finds its place by looking its own instant's point up in the axis. Identity
     is also the comparison that means anything here: two instants that happened to record
     the same depth are still two samples.
     """
@@ -694,8 +696,11 @@ def read_dive(self) -> dict[str, Any] | None:
         # In §6.2's own member order, so a converted dive reads down the schema.
         self.read_duration(session, summary, dive, where)
         self.read_depths(session, summary, samples, dive, where)
-        self.read_water_type(dive, where)
-        self.read_oxygen(session, summary, dive, where)
+        # The salinity setting and the oxygen clocks are the computer's own (§6.4a), so they
+        # are read here and carried on its recording below rather than on the dive — and the
+        # clocks are enough on their own to make one, where the setting is not.
+        salinity = self.read_salinity(where)
+        readouts = self.read_oxygen(session, summary, where)
         self.read_positions(samples, dive)
 
         cylinders, sensors = self.read_cylinders(where)
@@ -706,11 +711,14 @@ def read_dive(self) -> dict[str, Any] | None:
         # one to point at.
         profile = self.read_profile(samples, cylinders, sensors, where)
         # A FIT file is one dive written by one computer, so a converted document has
-        # exactly one recording (§6.4a) — and none at all where the file names no computer
-        # and kept no usable sample, §6.4a forbidding a recording that carries nothing.
+        # exactly one recording (§6.4a) — and none at all where the file names no computer,
+        # kept no usable sample and states no readout, §6.4a forbidding a recording that
+        # carries nothing.
         built = recording(
             device=self.read_device(session, where),
             deco_model=self.read_deco_model(where),
+            salinity=salinity,
+            readouts=readouts,
             profile=profile,
         )
         if built is not None:
@@ -833,8 +841,8 @@ def local_offset(self) -> timezone | None:
 
     # -- the summary scalars -----------------------------------------------------
 
-    def absent(self, member: str, source: str, where: str) -> None:
-        self.note(where, f"the file records no {source}, so the dive's {member} is not carried", "absent")
+    def absent(self, member: str, source: str, where: str, *, record: str = "dive") -> None:
+        self.note(where, f"the file records no {source}, so the {record}'s {member} is not carried", "absent")
 
     def read_duration(
         self,
@@ -952,15 +960,16 @@ def read_oxygen(
         self,
         session: fitdecode.FitDataMessage,
         summary: fitdecode.FitDataMessage | None,
-        dive: dict[str, Any],
         where: str,
-    ) -> None:
+    ) -> dict[str, float]:
         """The dive's CNS and OTU totals — the summary first, then the session.
 
         The mirror of `read_depths`, which prefers the session. The order is the other way
         round because these are the *dive's* oxygen accounting: on a multi-dive Garmin
         file the session totals cover the whole activity, while `summary` has already
-        picked out the summary that describes the dive being read.
+        picked out the summary that describes the dive being read. They are the computer's
+        own arithmetic, so they are returned for its recording rather than written onto the
+        dive (§6.4a).
 
         **`o2_toxicity` is the dive's ending OTU total rather than the OTUs it added**,
         which the profile's bare "OTUs" unit does not settle. The corpus does: one dive
@@ -969,44 +978,51 @@ def read_oxygen(
         delta it would have been 1. There is no `start_otu` anywhere in the FIT profile,
         so `otu_start` has no source at all — see `docs/fit-mapping.md`.
         """
+        readouts: dict[str, float] = {}
         for member, source in (("cns_start", "start_cns"), ("cns_end", "end_cns"), ("otu_end", "o2_toxicity")):
             value = _first(_number(_native(summary, source)), _number(_native(session, source)))
             if value is None:
-                self.absent(member, f"{source} on its session or on a dive summary", where)
-            elif recorded(value, record="dive", member=member):
-                dive[member] = float(value)
+                self.absent(member, f"{source} on its session or on a dive summary", where, record="recording")
+            elif recorded(value, record="recording", member=member):
+                readouts[member] = float(value)
             else:
                 self.note(
                     where,
                     f"the session's {source} is {value}, which the format records only from zero up; dropped",
                     "dropped",
                 )
+        return readouts
 
-    def read_water_type(self, dive: dict[str, Any], where: str) -> None:
-        """`dive_settings.water_type`, which is the only salinity evidence a FIT carries.
+    def read_salinity(self, where: str) -> str | None:
+        """`dive_settings.water_type`, which is the density the computer was set to.
 
-        `en13319` stays `en13319` rather than being folded into `salt`: it is the
-        calibration a computer ships set to, and rewriting it as the nearest real water
-        would be inventing a reading. `custom` says the diver dialled in a density number,
-        which §6.2 has no member for, and is reported rather than rounded off.
+        §6.4a's `salinity`, on the recording: a setting of this device rather than a record
+        of the water, so it never reaches the dive's `water_type`, and a reader deriving one
+        from the other is what §6.4a forbids. `en13319` stays `en13319` rather than being
+        folded into `salt`: it is the calibration a computer ships set to, and rewriting it
+        as the nearest real water would be inventing a reading. `custom` says the diver
+        dialled in a density number, which §6.4a has no member for, and is reported rather
+        than rounded off.
 
         **A device that wrote no `dive_settings`, or wrote one with no `water_type`,
         raises nothing.** The message is the computer's configuration rather than a record
         of the dive, so a setting it did not write is not a reading the dive failed to
         take — unlike the session summaries above, every one of which the device was
         describing this dive when it left empty.
+
+        **Untested against a real file**: no FIT file in the corpus writes the field.
         """
         value = _native(self.scan.settings, "water_type")
         if not isinstance(value, str):
-            return
-        if value in WATER_TYPES:
-            dive["water_type"] = WATER_TYPES[value]
-        else:
-            self.note(
-                where,
-                f"the device's water type is {value!r}, which this format has no value for; dropped",
-                "dropped",
-            )
+            return None
+        if value in SALINITIES:
+            return SALINITIES[value]
+        self.note(
+            where,
+            f"the device's water type setting is {value!r}, which this format has no value for; dropped",
+            "dropped",
+        )
+        return None
 
     def read_positions(self, samples: SampleAxis, dive: dict[str, Any]) -> None:
         """The fix on the way in and the fix on the way out, split at the deepest sample.
@@ -1024,8 +1040,8 @@ def read_positions(self, samples: SampleAxis, dive: dict[str, Any]) -> None:
         there is no pivot and so no answer, and nothing is written: a file that recorded
         positions and never a depth cannot say which of them is the entry.
         """
-        fixed = [(second, point) for second, point in samples.ordered() if point.latitude is not None]
-        depths = [(second, point.depth) for second, point in samples.ordered() if point.depth is not None]
+        fixed = [(at, point) for at, point in samples.ordered() if point.latitude is not None]
+        depths = [(at, point.depth) for at, point in samples.ordered() if point.depth is not None]
         if not fixed or not depths:
             return
 
@@ -1036,8 +1052,9 @@ def read_positions(self, samples: SampleAxis, dive: dict[str, Any]) -> None:
         before = [pair for pair in fixed if pair[0] <= pivot]
         after = [pair for pair in fixed if pair[0] > pivot]
         for member, chosen in (("entry_position", before[-1:]), ("exit_position", after[:1])):
-            for second, point in chosen:
-                where = f"dive/0/record/{second}"
+            for at, point in chosen:
+                # The elapsed second the record is at, which a FIT timestamp states whole.
+                where = f"dive/0/record/{at // 1000}"
                 found = position(point.latitude, point.longitude, note=self.note, where=where)
                 if found is not None:
                     dive[member] = found
@@ -1291,8 +1308,9 @@ def pressure(self, bar: Decimal | None, where: str) -> Decimal | None:
     def axis(self, where: str) -> SampleAxis:
         """The dive's time axis, offered every instant the file recorded a reading at.
 
-        The origin is the session's own start time, so the profile's seconds are elapsed
-        time from the moment the dive began — the same instant `started_at` names. A
+        The origin is the session's own start time, so the profile's axis is the elapsed
+        milliseconds from the moment the dive began — the same instant `started_at` names —
+        whole seconds times a thousand, `timestamp` stating nothing finer. A
         reading before it is dropped and reported by the axis, and a file whose session
         recorded no start time falls back to its earliest reading, which is the only other
         thing that can put a sample at zero.
@@ -1313,7 +1331,7 @@ def axis(self, where: str) -> SampleAxis:
         start = _native(self.scan.session, "start_time")
         origin = start if isinstance(start, datetime) else min(self.scan.points)
         for at, point in self.scan.points.items():
-            axis.offer(rounded(Decimal(str((at - origin).total_seconds()))), point)
+            axis.offer(milliseconds(Decimal(str((at - origin).total_seconds()))), point)
         return axis
 
     def read_profile(
@@ -1339,16 +1357,16 @@ def read_profile(
         ceiling = Channel("ceiling")
         temperature = Channel("temperature")
         pressures = {sensor: Channel("pressures") for sensor in sensors}
-        for second, point in samples.ordered():
+        for at, point in samples.ordered():
             if point.depth is not None:
-                depth.record(second, rounded(point.depth * CENTIMETRES_PER_METRE))
+                depth.record(at, rounded(point.depth * CENTIMETRES_PER_METRE))
             if point.ceiling is not None and point.ceiling > 0:
-                ceiling.record(second, rounded(point.ceiling * CENTIMETRES_PER_METRE))
+                ceiling.record(at, rounded(point.ceiling * CENTIMETRES_PER_METRE))
             if point.temperature is not None:
-                temperature.record(second, rounded(point.temperature * TENTHS_PER_UNIT))
+                temperature.record(at, rounded(point.temperature * TENTHS_PER_UNIT))
             for sensor, bar in point.pressures.items():
                 if sensor in pressures and 0 <= bar <= MAX_CYLINDER_PRESSURE:
-                    pressures[sensor].record(second, rounded(bar * TENTHS_PER_UNIT))
+                    pressures[sensor].record(at, rounded(bar * TENTHS_PER_UNIT))
 
         events = self.read_events(samples, where)
         numbered = [(number, pressures[sensor]) for number, sensor in enumerate(sensors) if sensor in pressures]
@@ -1389,11 +1407,11 @@ def read_events(self, samples: SampleAxis, where: str) -> list[dict[str, Any]]:
             for number, index in enumerate(_native_raw(gas, "message_index") for gas in self.gases)
             if isinstance(index, int) and not isinstance(index, bool)
         }
-        # The axis is what decided which instants have a place and what second each landed
-        # on, so an event asks it rather than recomputing from the session's start time:
-        # a sample the axis dropped for sharing a second with an earlier one is an instant
-        # the profile does not reach, and an event there has nowhere to go either.
-        seconds = {point: second for second, point in samples.ordered()}
+        # The axis is what decided which instants have a place and where each landed, so
+        # an event asks it rather than recomputing from the session's start time: a sample
+        # the axis dropped for sharing its millisecond with an earlier one is an instant the
+        # profile does not reach, and an event there has nowhere to go either.
+        places = {point: at for at, point in samples.ordered()}
 
         events: list[dict[str, Any]] = []
         for frame in self.scan.events:
@@ -1407,8 +1425,8 @@ def read_events(self, samples: SampleAxis, where: str) -> list[dict[str, Any]]:
             if not isinstance(at, datetime):
                 continue
             point = self.scan.points.get(at)
-            second = seconds.get(point) if point is not None else None
-            if second is None:
+            placed = places.get(point) if point is not None else None
+            if placed is None:
                 self.note(
                     where,
                     "an event is recorded at an instant the dive's samples do not reach, so it has no place "
@@ -1416,7 +1434,7 @@ def read_events(self, samples: SampleAxis, where: str) -> list[dict[str, Any]]:
                     "dropped",
                 )
                 continue
-            event: dict[str, Any] = {"time": second, "type": kind} if kind else {"time": second}
+            event: dict[str, Any] = {"time": placed, "type": kind} if kind else {"time": placed}
             data = _native(frame, "data")
             if kind == "gas_switch" and isinstance(data, int) and not isinstance(data, bool):
                 number = positions.get(data & MESSAGE_INDEX_MASK)
diff --git a/divejson/series.py b/divejson/series.py
index 3c5bc7f..cdacc64 100644
--- a/divejson/series.py
+++ b/divejson/series.py
@@ -7,7 +7,9 @@
 writes an array of objects with their own timestamps; Suunto's DM5 XML writes a
 `<Dive.Sample>` carrying every channel, `i:nil` where the sensor had nothing. What §6.5
 wants out of all five is the same: channels sampled on their own axes, with strictly
-increasing integer times.
+increasing integer times in milliseconds (§5.1). Every source states its times in seconds,
+whole or fractional, and an adapter hands this module `converter.milliseconds` of them, so
+a fraction the source states keeps its place on the axis.
 
 The rules that survive that translation are the ones in here, and no adapter re-derives
 them:
@@ -17,8 +19,8 @@
   order.
 * **A sample with no time has no place on the axis**, and is dropped and reported. Nothing
   else can put a reading anywhere.
-* **Two samples on one second keep the first and report the second**, because the times
-  are integers and strictly increasing while a source's are usually neither.
+* **Two samples on one millisecond keep the first and report the second**, because the
+  times are integers and strictly increasing while a source's are usually neither.
 * **The samples set the time axis and each channel takes only the samples that carried a
   reading for it.** No channel is padded to another's length: a Subsurface dive keeps 431
   depths beside 29 temperatures rather than inventing 402 readings.
@@ -44,13 +46,13 @@
 from collections.abc import Mapping, Sequence
 from typing import Any
 
-from .converter import Reporter, channel_floor, profile_members
+from .converter import Reporter, channel_floor, in_seconds, profile_members
 
 __all__ = ["Channel", "SampleAxis"]
 
 
 class Channel:
-    """One sampled quantity: the seconds it has readings at, and the readings.
+    """One sampled quantity: the milliseconds it has readings at, and the readings.
 
     Values are integers in the units §6.5 fixes for each channel — centimetres of depth,
     tenths of a degree, tenths of a bar, hundredths of a bar of ppO₂ — so the scaling is the
@@ -73,15 +75,16 @@ def __init__(self, name: str) -> None:
         self.refused = 0
         self._floor = channel_floor(name)
 
-    def record(self, second: int, value: int) -> bool:
-        """Take one reading, unless the floor refuses it or the channel has one already.
+    def record(self, at: int, value: int) -> bool:
+        """Take one reading at a millisecond, unless the floor refuses it or one is there.
 
         Two refusals and one return value, reported in two different places on purpose.
         **A value below the channel's floor is refused here**, because that floor is §6.5's
         and the sentence is the same in every format; the count is reported once, by
-        `SampleAxis.profile`. A repeat on one second is two readings of one channel inside
-        one sample — two tank pressures resolving to one cylinder — and only the caller
-        knows which reading it was, so that one returns silently for the caller to report.
+        `SampleAxis.profile`. A repeat on one millisecond is two readings of one channel
+        inside one sample — two tank pressures resolving to one cylinder — and only the
+        caller knows which reading it was, so that one returns silently for the caller to
+        report.
 
         A caller that reports its own `False` therefore has to be sure which refusal it
         saw; `taken` is how it asks, and the one such caller uses it.
@@ -89,15 +92,15 @@ def record(self, second: int, value: int) -> bool:
         if self._floor is not None and value < self._floor:
             self.refused += 1
             return False
-        if self.taken(second):
+        if self.taken(at):
             return False
-        self.times.append(second)
+        self.times.append(at)
         self.values.append(value)
         return True
 
-    def taken(self, second: int) -> bool:
-        """Whether this channel already holds a reading at that second."""
-        return bool(self.times) and self.times[-1] == second
+    def taken(self, at: int) -> bool:
+        """Whether this channel already holds a reading at that millisecond."""
+        return bool(self.times) and self.times[-1] == at
 
     def __len__(self) -> int:
         return len(self.times)
@@ -109,9 +112,10 @@ def member(self) -> dict[str, list[int]]:
 class SampleAxis:
     """The time axis of one dive's profile, and the profile built on it.
 
-    An adapter offers every sample it found with the second it was recorded at, then walks
-    `ordered()` to fill its channels, then asks for `profile()`. What is dropped on the way
-    is reported through the `note` this was built with.
+    An adapter offers every sample it found with the millisecond it was recorded at, then
+    walks `ordered()` to fill its channels, then asks for `profile()`. What is dropped on
+    the way is reported through the `note` this was built with, which speaks seconds
+    (`converter.in_seconds`) because the source and the diver both do.
     """
 
     __slots__ = ("_note", "_where", "_noun", "_time_member", "_seen", "_offered", "_ordered")
@@ -136,40 +140,40 @@ def __init__(
         self._offered: list[tuple[int, Any]] = []
         self._ordered: list[tuple[int, Any]] | None = None
 
-    def offer(self, second: int | None, payload: Any) -> None:
-        """One of the source's samples, with the second it recorded — or `None` for none.
+    def offer(self, at: int | None, payload: Any) -> None:
+        """One of the source's samples, with its millisecond on the axis — or `None` for none.
 
         `payload` is whatever the adapter needs to read the sample's channels off again on
         the second pass; this class never looks inside it.
         """
-        at = f"{self._where}/{self._noun}/{self._seen}"
+        where = f"{self._where}/{self._noun}/{self._seen}"
         self._seen += 1
-        if second is None:
+        if at is None:
             self._note(
-                at,
+                where,
                 f"the {self._noun} records no {self._time_member}, so it has no place on "
                 "the profile's time axis; dropped",
                 "dropped",
             )
-        elif second < 0:
-            self._note(at, f"the {self._noun} is at {second} s, before the dive began; dropped", "dropped")
+        elif at < 0:
+            self._note(where, f"the {self._noun} is at {in_seconds(at)} s, before the dive began; dropped", "dropped")
         else:
-            self._offered.append((second, payload))
+            self._offered.append((at, payload))
 
     def ordered(self) -> list[tuple[int, Any]]:
         """The samples that have a place on the axis, in recorded-time order."""
         if self._ordered is None:
             kept: list[tuple[int, Any]] = []
-            for second, payload in sorted(self._offered, key=lambda pair: pair[0]):
-                if kept and kept[-1][0] == second:
+            for at, payload in sorted(self._offered, key=lambda pair: pair[0]):
+                if kept and kept[-1][0] == at:
                     self._note(
                         self._where,
-                        f"two {self._noun}s share the second {second}; the later one is dropped, because "
-                        "the format's sample times are strictly increasing (spec §6.5)",
+                        f"two {self._noun}s are both at {in_seconds(at)} s, to the millisecond; the later one is "
+                        "dropped, because the format's sample times are strictly increasing (spec §6.5)",
                         "dropped",
                     )
                     continue
-                kept.append((second, payload))
+                kept.append((at, payload))
             self._ordered = kept
         return self._ordered
 
diff --git a/divejson/ssrf.py b/divejson/ssrf.py
index 97c5dbc..6cc549c 100644
--- a/divejson/ssrf.py
+++ b/divejson/ssrf.py
@@ -21,8 +21,9 @@
 reported** rather than converted by a factor no file has checked. That is the whole reason
 this reader has no scale ambiguity of its own: UDDF's `<tankvolume>` and `<o2>` are numbers
 whose units the file never states, and there is no such number here. This reader therefore
-emits no `resolved` finding, and the only two kinds in its report are `absent` and
-`dropped`.
+emits one `resolved` finding and it is not about a scale — a `<dive @cns>` or `@otu` on a
+dive with more than one recording, the file not saying whose figure it is — and past that
+the only two kinds in its report are `absent` and `dropped`.
 
 **A dive has no id, so its identity is its position.** Subsurface keys a dive by its
 computer's own dive id where there is one and by nothing at all otherwise; `@number` is the
@@ -59,7 +60,6 @@
 from .converter import (
     CENTIMETRES_PER_METRE,
     MAX_NAME,
-    MAX_NOTES,
     PRODUCER_KEY,
     TENTHS_PER_UNIT,
     Conversion,
@@ -74,6 +74,8 @@
     device,
     header,
     integer_of,
+    milliseconds,
+    onto_primary,
     recorded,
     recording,
     rounded,
@@ -113,8 +115,9 @@
 
 # A dive's `@date` and `@time`. Subsurface writes both to the digit, and the leniency here
 # is for the seconds alone: a hand-edited file missing them costs a dive otherwise, and
-# §5.2's grammar requires them. There is no offset in either pattern because there is none
-# anywhere in the format — see `read_started_at`.
+# §5.2's grammar requires them. A `@date` with no `@time` at all is a date-only start, which
+# §5.2 has a value for. There is no offset in either pattern because there is none anywhere
+# in the format — see `read_started_at`.
 _DATE = re.compile(r"\A\d{4}-\d{2}-\d{2}\Z")
 _TIME = re.compile(r"\A(?P<hour>\d{2}):(?P<minute>\d{2})(?::(?P<second>\d{2}))?(?P<fraction>\.\d+)?\Z")
 
@@ -130,6 +133,15 @@ def _clock(raw: str) -> Decimal | None:
     return minutes * SECONDS_PER_MINUTE + Decimal(match.group(2))
 
 
+def _calendar_date(text: str) -> bool:
+    """Whether a `YYYY-MM-DD` is a day the calendar has, which no pattern can check."""
+    try:
+        datetime.fromisoformat(f"{text}T00:00:00")
+    except ValueError:
+        return False
+    return True
+
+
 # Every unit spelling this reader knows, against the way the number in front of it is read.
 # A measurement whose unit is not a key here is **dropped and reported** rather than read at
 # a guessed scale, which is `converting.md`'s refuse-rather-than-guess rule applied to the
@@ -419,17 +431,19 @@ def read_dive(self, element: ET.Element, index: int) -> dict[str, Any] | None:
 
         notes = text(child(element, "notes"))
         if notes:
-            dive["notes"] = self.capped(notes, MAX_NOTES, where, "the note")
+            dive["notes"] = notes
 
-        # `cns='11%'` and `otu='31'`: a percentage and a bare count, both of them the dive's
-        # *end* figure. Subsurface records no starting pair, which is why `cns_start` and
-        # `otu_start` have no source here.
+        # `cns='11%'` and `otu='31'`: a percentage and a bare count, both of them the *end*
+        # figure of the computer that computed them. Subsurface records no starting pair,
+        # which is why `cns_start` and `otu_start` have no source here. They are §6.4a's
+        # readouts and not the dive's, so they wait for the recordings below.
+        readouts: dict[str, float] = {}
         for member, source, unit in (("cns_end", "cns", "%"), ("otu_end", "otu", "")):
             value = self.measure(attribute(element, source), unit, where, f"<dive {source}>")
             if value is None:
                 continue
-            if recorded(value, record="dive", member=member):
-                dive[member] = float(value)
+            if recorded(value, record="recording", member=member):
+                readouts[member] = float(value)
             else:
                 self.note(where, f"<dive {source}> is {value}, which the format records only from zero up; dropped", "dropped")
 
@@ -457,6 +471,11 @@ def read_dive(self, element: ET.Element, index: int) -> dict[str, Any] | None:
             dive["cylinders"] = cylinders
 
         recordings = self.read_recordings(element, dive, where)
+        # On the `<dive>` rather than on a `<divecomputer>`, so they go where
+        # `docs/converting.md` sends a dive-level readout: the primary recording, or one of
+        # their own where no computer yielded one.
+        stated = " and ".join(f"<dive {member[:3]}>" for member in readouts)
+        onto_primary(recordings, readouts, note=self.note, where=where, stated=stated)
         if recordings:
             dive["recordings"] = recordings
         return dive
@@ -474,6 +493,11 @@ def read_started_at(self, element: ET.Element, where: str) -> str | None:
         The two halves are composed rather than concatenated, because §5.2's grammar
         requires the seconds and a hand-edited `time='11:49'` would otherwise reach the
         document and fail its own validation.
+
+        **A `@date` with no `@time` is a date-only start**, the date alone (§5.2): the day was
+        recorded and the time of day was not, and midnight would be a time the file never
+        stated. It carries no offset note, there being no wall clock for an offset to be
+        missing from.
         """
         date = attribute(element, "date")
         clock = attribute(element, "time")
@@ -485,8 +509,16 @@ def read_started_at(self, element: ET.Element, where: str) -> str | None:
             )
             return None
         if clock is None:
-            self.note(where, "the dive records a date with no time of day; read as midnight", "absent")
-            clock = "00:00:00"
+            if _DATE.match(date) is None or not _calendar_date(date):
+                self.note(where, "the dive's date is not a date; the dive is dropped (spec §6.2)", "dropped")
+                return None
+            self.note(
+                where,
+                "the dive records a date with no time of day; read as a date-only start rather than as "
+                "midnight (spec §5.2)",
+                "absent",
+            )
+            return date
 
         parts = _TIME.match(clock)
         if _DATE.match(date) is None or parts is None:
@@ -787,16 +819,16 @@ def read_profile(self, computer: ET.Element, where: str) -> dict[str, Any] | Non
 
         axis = SampleAxis(self.note, where, noun="sample", time_member="time")
         for sample in samples:
-            axis.offer(integer_of(self.measure(attribute(sample, "time"), "min", where, "<sample time>")), sample)
+            axis.offer(milliseconds(self.measure(attribute(sample, "time"), "min", where, "<sample time>")), sample)
 
         depth = Channel("depth")
         temperature = Channel("temperature")
-        for second, sample in axis.ordered():
+        for at, sample in axis.ordered():
             metres = self.measure(attribute(sample, "depth"), "m", where, "<sample depth>")
             if metres is not None:
-                depth.record(second, rounded(metres * CENTIMETRES_PER_METRE))
+                depth.record(at, rounded(metres * CENTIMETRES_PER_METRE))
             celsius = self.measure(attribute(sample, "temp"), "C", where, "<sample temp>")
             if celsius is not None:
-                temperature.record(second, rounded(celsius * TENTHS_PER_UNIT))
+                temperature.record(at, rounded(celsius * TENTHS_PER_UNIT))
 
         return axis.profile({"depth": depth, "temperature": temperature})
diff --git a/divejson/suunto_json.py b/divejson/suunto_json.py
index 37d469d..6e89274 100644
--- a/divejson/suunto_json.py
+++ b/divejson/suunto_json.py
@@ -83,6 +83,8 @@
     decimal_of,
     device,
     header,
+    in_seconds,
+    milliseconds,
     position,
     record_inferred,
     recorded,
@@ -439,7 +441,11 @@ def _elapsed(moment: datetime, origin: datetime) -> Decimal:
     """
     if (moment.tzinfo is None) != (origin.tzinfo is None):
         moment, origin = moment.replace(tzinfo=None), origin.replace(tzinfo=None)
-    return Decimal(str((moment - origin).total_seconds()))
+    # Exact to the microsecond a `datetime` holds, rather than through the float
+    # `total_seconds` returns: the axis keeps the millisecond, and a value that reached it by
+    # way of a binary fraction could round away from the one the file states.
+    delta = moment - origin
+    return Decimal(delta.days * 86_400 + delta.seconds) + Decimal(delta.microseconds) / Decimal(1_000_000)
 
 
 @dataclass(slots=True)
@@ -564,8 +570,10 @@ def read_dive(self) -> dict[str, Any] | None:
         # In §6.2's own member order, so a converted dive reads down the schema.
         self.read_duration(dive, where)
         self.read_depths(dive, where)
-        self.read_oxygen(diving, dive, where)
-        self.read_surface_pressure(diving, dive, where)
+        # The oxygen clocks and the surface pressure are the computer's own figures, so they
+        # are read here and carried on its recording below rather than on the dive.
+        readouts = self.read_oxygen(diving, where)
+        readouts.update(self.read_surface_pressure(diving, where))
         self.read_positions(samples, dive)
 
         cylinders, numbering = self.read_cylinders(diving, started.at, where)
@@ -581,6 +589,7 @@ def read_dive(self) -> dict[str, Any] | None:
             device=self.read_device(diving, where),
             mode=self.read_mode(diving, where),
             deco_model=self.read_deco_model(diving, where),
+            readouts=readouts,
             profile=profile,
         )
         if built is not None:
@@ -772,10 +781,10 @@ def read_depths(self, dive: dict[str, Any], where: str) -> None:
             )
             del dive["avg_depth"]
 
-    def read_oxygen(self, diving: dict[str, Any], dive: dict[str, Any], where: str) -> None:
+    def read_oxygen(self, diving: dict[str, Any], where: str) -> dict[str, float]:
         """The oxygen clock, out of `Diving.StartTissue` and `Diving.EndTissue`.
 
-        **CNS is a 0-1 fraction here and §6.2 holds whole percent**, which is invisible
+        **CNS is a 0-1 fraction here and §6.4a holds whole percent**, which is invisible
         until the same dive is read out of two Suunto exports: `EndTissue.CNS: 0.069` is the
         DM5 export's `<CnsEnd>7</CnsEnd>`. Carrying it unconverted would report a 69 %
         oxygen clock as 0.069 %. OTU needs no conversion — it is the same absolute count in
@@ -783,9 +792,10 @@ def read_oxygen(self, diving: dict[str, Any], dive: dict[str, Any], where: str)
         full float32 where the desktop one rounds.
 
         Both members read a zero as an answer, which is the schema's decision rather than
-        this reader's: §6.2 gives them `minimum: 0`, so the 0 a diver's first dive of the
+        this reader's: §6.4a gives them `minimum: 0`, so the 0 a diver's first dive of the
         day starts on is a reading and not a placeholder.
         """
+        readouts: dict[str, float] = {}
         for block, half in (("StartTissue", "start"), ("EndTissue", "end")):
             tissue = diving.get(block)
             tissue = tissue if isinstance(tissue, dict) else {}
@@ -795,7 +805,7 @@ def read_oxygen(self, diving: dict[str, Any], dive: dict[str, Any], where: str)
             ):
                 if value is None:
                     continue
-                if not recorded(value, record="dive", member=member):
+                if not recorded(value, record="recording", member=member):
                     self.note(
                         where,
                         f"the export records {member.replace('_', ' ')} as {value}, which is below what the "
@@ -803,18 +813,19 @@ def read_oxygen(self, diving: dict[str, Any], dive: dict[str, Any], where: str)
                         "dropped",
                     )
                     continue
-                dive[member] = float(value)
+                readouts[member] = float(value)
+        return readouts
 
-    def read_surface_pressure(self, diving: dict[str, Any], dive: dict[str, Any], where: str) -> None:
-        """`Diving.SurfacePressure`, in Pascal where §6.2 holds bar.
+    def read_surface_pressure(self, diving: dict[str, Any], where: str) -> dict[str, float]:
+        """`Diving.SurfacePressure`, in Pascal where §6.4a holds bar.
 
-        §6.2 bounds the member at 0.4 to 1.2 bar, which is the range a barometer at a dive
+        §6.4a bounds the member at 0.4 to 1.2 bar, which is the range a barometer at a dive
         site can read; a value outside it is a device that recorded something other than a
         surface pressure, and is reported rather than clamped.
         """
         pascal = _number(diving.get("SurfacePressure"))
         if pascal is None:
-            return
+            return {}
         bar = pascal / PASCALS_PER_BAR
         if not Decimal("0.4") <= bar <= Decimal("1.2"):
             self.note(
@@ -823,8 +834,8 @@ def read_surface_pressure(self, diving: dict[str, Any], dive: dict[str, Any], wh
                 "allows; dropped",
                 "dropped",
             )
-            return
-        dive["surface_pressure"] = float(bar)
+            return {}
+        return {"surface_pressure": float(bar)}
 
     def read_positions(self, samples: SampleAxis, dive: dict[str, Any]) -> None:
         """The fix on the way in and the fix on the way out, split at the deepest sample.
@@ -842,8 +853,8 @@ def read_positions(self, samples: SampleAxis, dive: dict[str, Any]) -> None:
         then — so without it these files yield an exit and no entry, while the app draws
         both pins from the same export.
         """
-        fixed = [(second, sample) for second, sample in samples.ordered() if sample.latitude is not None]
-        depths = [(second, sample.depth) for second, sample in samples.ordered() if sample.depth is not None]
+        fixed = [(at, sample) for at, sample in samples.ordered() if sample.latitude is not None]
+        depths = [(at, sample.depth) for at, sample in samples.ordered() if sample.depth is not None]
         if not fixed or not depths:
             return
 
@@ -854,12 +865,12 @@ def read_positions(self, samples: SampleAxis, dive: dict[str, Any]) -> None:
         before = [pair for pair in fixed if pair[0] <= pivot]
         after = [pair for pair in fixed if pair[0] > pivot]
         for member, chosen in (("entry_position", before[-1:]), ("exit_position", after[:1])):
-            for second, sample in chosen:
+            for at, sample in chosen:
                 found = position(
                     sample.latitude,
                     sample.longitude,
                     note=self.note,
-                    where=f"dive/0/sample/{second}",
+                    where=f"dive/0/sample/{in_seconds(at)}",
                 )
                 if found is not None:
                     dive[member] = found
@@ -960,7 +971,7 @@ def declared_cylinder(self, gas: dict[str, Any], where: str) -> dict[str, Any]:
         limit = None if po2 is None else po2 / PASCALS_PER_BAR
         if limit is not None:
             if Decimal("0.4") <= limit <= Decimal(2):
-                cylinder["po2_limit"] = float(limit)
+                cylinder["ppo2_limit"] = float(limit)
             else:
                 self.note(
                     where,
@@ -1036,12 +1047,13 @@ def transmitted(self, origin: datetime) -> dict[int, tuple[Decimal | None, Decim
 
         **Over the samples' own recorded instants, and not off the profile.** Two ways of
         taking them off the profile lose the answer, and *neither is the merged axis* —
-        which reproduces it, `axis` folding an entry into the second another channel's entry
+        which reproduces it, `axis` folding an entry into the instant another channel's entry
         already holds rather than dropping it. What loses it is either of the two below,
         measured on the file this reader is checked against, whose start pressure is
         211.625 bar:
 
-        * an **unmerged** axis, one entry per second with the first winning it whole, gives
+        * an **unmerged** whole-second axis, one entry per second with the first winning it
+          whole, gives
           211.26562 — the earlier depth entry taking the second and carrying the cylinder
           reading 0.1 s later away with it;
         * the axis's pressure **channel**, which §6.5 stores in tenths of a bar, gives
@@ -1140,26 +1152,28 @@ def pressure(self, bar: Decimal | None, where: str) -> Decimal | None:
     # -- the profile -------------------------------------------------------------
 
     def axis(self, origin: datetime, where: str) -> SampleAxis:
-        """The dive's time axis, offered one merged sample per second the file recorded at.
-
-        The origin is `Header.DateTime`, so the profile's seconds are elapsed time from the
-        instant `started_at` names — and a sample before it is dropped and reported by the
-        axis, which is the right answer for a stream whose entries arrive out of order.
-
-        **Entries that land on one second are merged rather than one of them being
-        dropped**, and that is the whole difference between a faithful profile and a
-        quarter of one. This exporter appends its sensor streams as separate entries: on the
-        file this reader is measured against, 7 477 entries carry a depth, a temperature, a
-        satellite fix or a battery reading, almost never two of those at once, and they
-        collide on the whole seconds §6.5 requires. Offering them one at a time leaves the
-        axis choosing between a depth and a temperature recorded at the same instant, and it
-        keeps 345 of the dive's 431 depths. Merging keeps all 431 — the count the same
-        dive's FIT reading gives — because each of §6.5's channels carries its own times and
-        two different channels at one second were never in competition.
-
-        What is still a collision is one **channel** twice on a second, and that is reported
-        per channel rather than per sample: a file whose streams overlap throughout would
-        otherwise write thousands of identical lines saying one thing about the file.
+        """The dive's time axis, offered one merged sample per millisecond the file recorded at.
+
+        The origin is `Header.DateTime`, so the profile's axis is the elapsed milliseconds
+        from the instant `started_at` names — the fraction each `TimeISO8601` states kept, so
+        `suunto-ocean.json`'s first depth sits at 160 rather than at 0 — and a sample before
+        it is dropped and reported by the axis, which is the right answer for a stream whose
+        entries arrive out of order.
+
+        **Entries that land on one millisecond are merged rather than one of them being
+        dropped.** This exporter appends its sensor streams as separate entries: on the file
+        this reader is measured against, 7 477 entries carry a depth, a temperature, a
+        satellite fix or a battery reading, almost never two of those at once. On a
+        whole-second axis they collided, and offering them one at a time kept 345 of the
+        dive's 431 depths where merging kept all 431 — the count the same dive's FIT reading
+        gives. The millisecond places each at its own instant, and merging is what still
+        decides two entries of different channels stamped the same one: each of §6.5's
+        channels carries its own times, and two different channels at one instant were never
+        in competition.
+
+        What is still a collision is one **channel** twice on a millisecond, and that is
+        reported per channel rather than per sample: a file whose streams overlap throughout
+        would otherwise write thousands of identical lines saying one thing about the file.
         """
         axis = SampleAxis(self.note, where, noun="sample", time_member="TimeISO8601")
         merged: dict[int, _Sample] = {}
@@ -1170,10 +1184,10 @@ def axis(self, origin: datetime, where: str) -> SampleAxis:
             if moment is None:
                 undated += 1
                 continue
-            second = rounded(_elapsed(moment.at, origin))
-            standing = merged.get(second)
+            at = milliseconds(_elapsed(moment.at, origin))
+            standing = merged.get(at)
             if standing is None:
-                merged[second] = self.sample(raw)
+                merged[at] = self.sample(raw)
             else:
                 _merge(standing, self.sample(raw), collisions)
 
@@ -1182,12 +1196,12 @@ def axis(self, origin: datetime, where: str) -> SampleAxis:
         for channel, count in sorted(collisions.items()):
             self.note(
                 where,
-                f"{count} {channel} readings land on a second the dive already has one at; the later reading "
+                f"{count} {channel} readings land on a millisecond the dive already has one at; the later reading "
                 "is dropped, because the format's sample times are strictly increasing (spec §6.5)",
                 "dropped",
             )
-        for second, sample in merged.items():
-            axis.offer(second, sample)
+        for at, sample in merged.items():
+            axis.offer(at, sample)
         return axis
 
     def sample(self, raw: dict[str, Any]) -> _Sample:
@@ -1286,15 +1300,15 @@ def read_profile(
         # Counted rather than reported one at a time, for `axis`'s reason: this device writes
         # its absent-marker for hundreds of consecutive samples.
         empty_tts = 0
-        for second, sample in samples.ordered():
+        for at, sample in samples.ordered():
             if sample.depth is not None:
-                depth.record(second, rounded(sample.depth * CENTIMETRES_PER_METRE))
+                depth.record(at, rounded(sample.depth * CENTIMETRES_PER_METRE))
             if sample.ceiling is not None and sample.ceiling > 0:
-                ceiling.record(second, rounded(sample.ceiling * CENTIMETRES_PER_METRE))
+                ceiling.record(at, rounded(sample.ceiling * CENTIMETRES_PER_METRE))
             if sample.kelvin is not None:
-                temperature.record(second, rounded((sample.kelvin - KELVIN_OFFSET) * TENTHS_PER_UNIT))
+                temperature.record(at, rounded((sample.kelvin - KELVIN_OFFSET) * TENTHS_PER_UNIT))
             if sample.ndl is not None:
-                ndl.record(second, rounded(sample.ndl))
+                ndl.record(at, rounded(sample.ndl))
             if sample.tts is not None:
                 if sample.tts == 0:
                     empty_tts += 1
@@ -1304,16 +1318,16 @@ def read_profile(
                     # that floor is applied and reported, once for every format. Refusing a
                     # negative here instead would drop it silently, which is the one thing
                     # the shared floor exists to stop.
-                    tts.record(second, rounded(sample.tts))
+                    tts.record(at, rounded(sample.tts))
             if sample.gradient_factor is not None:
-                gradient_factor.record(second, rounded(sample.gradient_factor))
+                gradient_factor.record(at, rounded(sample.gradient_factor))
             if sample.surface_gradient_factor is not None:
-                surface_gradient_factor.record(second, rounded(sample.surface_gradient_factor))
+                surface_gradient_factor.record(at, rounded(sample.surface_gradient_factor))
             for source_number, pascal in sample.pressures.items():
                 bar = pascal / PASCALS_PER_BAR
                 number = numbering.get(source_number)
                 if number in pressures and 0 <= bar <= MAX_CYLINDER_PRESSURE:
-                    pressures[number].record(second, rounded(bar * TENTHS_PER_UNIT))
+                    pressures[number].record(at, rounded(bar * TENTHS_PER_UNIT))
         if empty_tts:
             self.note(
                 where,
@@ -1370,19 +1384,19 @@ def read_events(
         would only double it. A `GasSwitch` has no `Active` and is not a pair.
         """
         events: list[dict[str, Any]] = []
-        for second, sample in samples.ordered():
+        for at, sample in samples.ordered():
             for name, payload in sample.events:
-                event = self.event(name, payload, second, numbering, where)
+                event = self.event(name, payload, at, numbering, where)
                 if event is not None:
                     events.append(event)
         return events
 
     def event(
-        self, name: str, payload: Any, second: int, numbering: dict[int, int], where: str
+        self, name: str, payload: Any, at: int, numbering: dict[int, int], where: str
     ) -> dict[str, Any] | None:
         """One `{name: payload}` pair as a §6.5 event, or nothing worth a marker."""
         if name == "GasSwitch" and isinstance(payload, dict):
-            event: dict[str, Any] = {"time": second, "type": "gas_switch"}
+            event: dict[str, Any] = {"time": at, "type": "gas_switch"}
             number = payload.get("GasNumber")
             if not isinstance(number, bool) and isinstance(number, int):
                 # The source's own number resolved to the cylinder's position, so a marker
@@ -1404,14 +1418,14 @@ def event(
             # than wording the diver was shown, so carrying it would put "Deco" on a marker
             # nobody read.
             stop = STOP_TYPES.get(reported.lower())
-            return None if stop is None else {"time": second, "type": stop}
+            return None if stop is None else {"time": at, "type": stop}
         if name in ALERT_NAMES:
             # The type its wording earns, **and** that wording as the label: §6.6's
             # vocabulary was seeded from this list, one value per distinct meaning, and
             # "Ceiling Broken" is still what the diver was shown. An alert the table does
             # not name arrives with no type at all rather than forced into the nearest one.
             kind = ALERT_TYPES.get(reported.lower())
-            event = {"time": second, "type": kind} if kind is not None else {"time": second}
+            event = {"time": at, "type": kind} if kind is not None else {"time": at}
             event["label"] = reported
             return event
         return None
@@ -1423,13 +1437,13 @@ def scaled(self, value: Decimal | None, factor: Decimal) -> Decimal | None:
 
 
 def _merge(standing: _Sample, arriving: _Sample, collisions: dict[str, int]) -> None:
-    """Fold a later entry's readings into the one already holding that second.
+    """Fold a later entry's readings into the one already holding that millisecond.
 
     The first reading of a channel wins and the later one is counted, which is
     `series.py`'s rule applied one level down: the channels are what §6.5 makes strictly
-    increasing, and two entries at one second are only in competition where they carry the
+    increasing, and two entries at one millisecond are only in competition where they carry the
     same channel. Events are not a channel and are all kept — a gas switch and an alarm on
-    one second are two things that happened.
+    one millisecond are two things that happened.
     """
     for member, channel in (
         ("depth", "depth"),
diff --git a/divejson/suunto_xml.py b/divejson/suunto_xml.py
index 9935db1..01fc117 100644
--- a/divejson/suunto_xml.py
+++ b/divejson/suunto_xml.py
@@ -25,7 +25,7 @@
 decompression algorithm; an archive of the owner's whole export directory now converts to
 **384** dives where it used to produce 342 and a report saying why the other 42 were
 missing. The 42 are exactly the 42 that carry no `<DiveMixture>` at all — and since they had
-never been read past their mode, carrying them is also what first made the same-second
+never been read past their mode, carrying them is also what first made the sample-time
 collision rule fire on a real file. Nothing here is skipped for its mode, which is where
 this reader and the Suunto app JSON one part company: a run and a dive are the same shape
 there, and `ActivityType` is the only thing that separates them.
@@ -63,7 +63,6 @@
 
 from .converter import (
     CENTIMETRES_PER_METRE,
-    MAX_NOTES,
     PRODUCER_KEY,
     TENTHS_PER_UNIT,
     Conversion,
@@ -73,12 +72,13 @@
     Note,
     NoteKind,
     Scope,
-    capped,
     deco_model,
     decimal_of,
     device,
     header,
+    in_seconds,
     integer_of,
+    milliseconds,
     recorded,
     recording,
     rounded,
@@ -154,7 +154,7 @@
 # pressure it puts on a cylinder in one unit.
 MAX_CYLINDER_PRESSURE = Decimal(350)
 
-# The bounds §6.2 puts on a surface pressure and §6.3 on a ppO₂ limit, in the units those
+# The bounds §6.4a puts on a surface pressure and §6.3 on a ppO₂ limit, in the units those
 # members hold. Both are wide enough that a reading outside one is a device that recorded
 # something other than what the element claims, which is reported rather than clamped.
 MIN_SURFACE_PRESSURE, MAX_SURFACE_PRESSURE = Decimal("0.4"), Decimal("1.2")
@@ -320,24 +320,26 @@ def number(self, element: ET.Element | None, name: str, where: str) -> Decimal |
             self.note(where, f"<{name}> is not a number this reader can carry; dropped", "dropped")
         return value
 
-    def scalar(self, dive: dict[str, Any], member: str, name: str, where: str) -> None:
-        """One recorded number onto one dive member, by the member's own constraint.
+    def scalar(
+        self, target: dict[str, Any], member: str, name: str, where: str, *, record: str = "dive"
+    ) -> None:
+        """One recorded number onto one member of a record, by the member's own constraint.
 
         Which way a zero reads is the schema's decision rather than this module's, so
         `recorded` is asked with the member the value is headed for: a `<MaxDepth>0</MaxDepth>`
         is a dive whose depth the computer never had, while a zero `<CnsEnd>` is the oxygen
         clock a diver's first dive of the day starts on.
 
-        Every member written through here is one §6.2 types as a `number`, so the reading
-        is carried as a float. `duration`, the one whole-number member this reader maps, has
+        Every member written through here is one §6 types as a `number`, so the reading is
+        carried as a float. `duration`, the one whole-number member this reader maps, has
         `read_duration` of its own — an integer member has to be rounded *before* its
         constraint is asked about, and that ordering is the point of separating them.
         """
         value = self.number(self.root, name, where)
         if value is None:
             return
-        if recorded(value, record="dive", member=member):
-            dive[member] = float(value)
+        if recorded(value, record=record, member=member):
+            target[member] = float(value)
         else:
             self.note(
                 where,
@@ -410,18 +412,20 @@ def read_dive(self) -> dict[str, Any] | None:
         self.read_duration(dive, where)
         notes = _recorded_text(self.root, "Note")
         if notes is not None:
-            dive["notes"] = capped(notes, MAX_NOTES, note=self.note, where=where, member="<Note>")
+            dive["notes"] = notes
         self.read_depths(dive, where)
         self.scalar(dive, "bottom_temperature", "BottomTemperature", where)
         self.read_conditions(where)
+        # The computer's own figures (§6.4a), so they wait for its recording below.
+        readouts: dict[str, float] = {}
         for member, name in (
             ("cns_start", "CnsStart"),
             ("cns_end", "CnsEnd"),
             ("otu_start", "OtuStart"),
             ("otu_end", "OtuEnd"),
         ):
-            self.scalar(dive, member, name, where)
-        self.read_surface_pressure(dive, where)
+            self.scalar(readouts, member, name, where, record="recording")
+        self.read_surface_pressure(readouts, where)
 
         cylinders = self.read_cylinders(where)
         profile = self.read_profile(cylinders, where)
@@ -438,6 +442,7 @@ def read_dive(self) -> dict[str, Any] | None:
             device=self.read_device(where),
             mode=mode,
             deco_model=self.read_deco_model(mode, where),
+            readouts=readouts,
             profile=profile,
         )
         if built is not None:
@@ -648,10 +653,10 @@ def read_conditions(self, where: str) -> None:
                     "dropped",
                 )
 
-    def read_surface_pressure(self, dive: dict[str, Any], where: str) -> None:
-        """`<SurfacePressure>`, in Pascal where §6.2 holds bar.
+    def read_surface_pressure(self, readouts: dict[str, float], where: str) -> None:
+        """`<SurfacePressure>`, in Pascal where §6.4a holds bar.
 
-        §6.2 bounds the member at 0.4 to 1.2 bar, which is the range a barometer at a dive
+        §6.4a bounds the member at 0.4 to 1.2 bar, which is the range a barometer at a dive
         site can read. That bound is also the backstop for the unit: every one of the 384
         exports in hand lands in 103 100 to 106 700, which is barometric on the Pascal
         reading and a hundred metres of seawater on the millibar one.
@@ -668,7 +673,7 @@ def read_surface_pressure(self, dive: dict[str, Any], where: str) -> None:
                 "dropped",
             )
             return
-        dive["surface_pressure"] = float(bar)
+        readouts["surface_pressure"] = float(bar)
 
     # -- cylinders ---------------------------------------------------------------
 
@@ -712,7 +717,7 @@ def read_cylinder(self, mixture: ET.Element, number: int, where: str) -> _Cylind
             if MIN_PO2_LIMIT <= po2 <= MAX_PO2_LIMIT:
                 # Already bar here (`<PO2>1.4</PO2>`), where the app's JSON export of the
                 # same dive writes the same limit in Pascal.
-                cylinder["po2_limit"] = float(po2)
+                cylinder["ppo2_limit"] = float(po2)
             else:
                 self.note(
                     where,
@@ -842,14 +847,13 @@ def read_switch_times(self, mixture: ET.Element, where: str) -> list[int]:
         times: list[int] = []
         for index, change in enumerate(_children(_child(mixture, "DiveGasChanges"), "DiveGasChange")):
             at = f"{where}/gas change/{index}"
-            seconds = self.number(change, "GasChangeTime", at)
-            if seconds is None:
+            placed = milliseconds(self.number(change, "GasChangeTime", at))
+            if placed is None:
                 continue
-            second = rounded(seconds)
-            if second < 0:
-                self.note(at, f"the gas change is at {second} s, before the dive began; dropped", "dropped")
+            if placed < 0:
+                self.note(at, f"the gas change is at {in_seconds(placed)} s, before the dive began; dropped", "dropped")
                 continue
-            times.append(second)
+            times.append(placed)
         return times
 
     # -- the profile -------------------------------------------------------------
@@ -860,12 +864,14 @@ def read_profile(self, cylinders: list[_Cylinder], where: str) -> dict[str, Any]
         Every sample element carries every channel, nil where the sensor had nothing — a
         mid-dive transmitter dropout is a nil `<Pressure>` on a sample whose `<Depth>` is
         unaffected — so the channels sit on their own axes and none is padded to another's
-        length. Two samples on one second are therefore a real collision here rather than
+        length. Two samples on one instant are therefore a real collision here rather than
         two sensor streams that were never in competition, and the axis settles them per
-        channel; it fires on 37 of the corpus's exports, every one of them a freedive, where
-        a 1 s sampling interval meets a `<Time>` that is not quite an integer. Those 37 were
-        unreachable while the reader stopped at `<Mode>3</Mode>` before it read a sample, so
-        carrying freedives is what first made this rule fire on a real file.
+        channel. On a whole-second axis it fired on 37 of the corpus's exports, every one of
+        them a freedive, where a 1 s sampling interval meets a `<Time>` that is not quite an
+        integer; `<Time>`'s decimal seconds reach the millisecond axis whole, so what still
+        collides is a `<Time>` the file repeats. Those 37 were unreachable while the reader
+        stopped at `<Mode>3</Mode>` before it read a sample, so carrying freedives is what
+        first made this rule fire on a real file.
 
         `<AveragedTemperature>` is deliberately not the temperature channel: it is a
         smoothed reading sitting beside the raw `<Temperature>` in the same element, and
@@ -889,8 +895,7 @@ def read_profile(self, cylinders: list[_Cylinder], where: str) -> dict[str, Any]
 
         axis = SampleAxis(self.note, where, noun="sample", time_member="<Time>")
         for index, sample in enumerate(samples):
-            seconds = self.number(sample, "Time", f"{where}/sample/{index}")
-            axis.offer(None if seconds is None else rounded(seconds), sample)
+            axis.offer(milliseconds(self.number(sample, "Time", f"{where}/sample/{index}")), sample)
 
         depth = Channel("depth")
         ceiling = Channel("ceiling")
@@ -900,10 +905,10 @@ def read_profile(self, cylinders: list[_Cylinder], where: str) -> dict[str, Any]
         # range usually does it for a run of samples, and one line per reading would be a
         # transmitter fault written out several hundred times.
         out_of_range = 0
-        for second, sample in axis.ordered():
+        for at, sample in axis.ordered():
             metres = self.number(sample, "Depth", where)
             if metres is not None:
-                depth.record(second, rounded(metres * CENTIMETRES_PER_METRE))
+                depth.record(at, rounded(metres * CENTIMETRES_PER_METRE))
             # A ceiling of zero is not a ceiling — zero says the diver may surface, and a
             # gap in the channel's times is how §6.5 spells no obligation. This export
             # writes `i:nil` rather than a zero on every no-deco sample, its 1 760 recorded
@@ -911,15 +916,15 @@ def read_profile(self, cylinders: list[_Cylinder], where: str) -> dict[str, Any]
             # rather than one this format needs.
             above = self.number(sample, "Ceiling", where)
             if above is not None and above > 0:
-                ceiling.record(second, rounded(above * CENTIMETRES_PER_METRE))
+                ceiling.record(at, rounded(above * CENTIMETRES_PER_METRE))
             celsius = self.number(sample, "Temperature", where)
             if celsius is not None:
-                temperature.record(second, rounded(celsius * TENTHS_PER_UNIT))
+                temperature.record(at, rounded(celsius * TENTHS_PER_UNIT))
             millibar = self.number(sample, "Pressure", where)
             if millibar is not None:
                 bar = millibar / MILLIBAR_PER_BAR
                 if 0 <= bar <= MAX_CYLINDER_PRESSURE:
-                    pressure.record(second, rounded(bar * TENTHS_PER_UNIT))
+                    pressure.record(at, rounded(bar * TENTHS_PER_UNIT))
                 else:
                     out_of_range += 1
         if out_of_range:
@@ -1050,9 +1055,9 @@ def read_events(self, cylinders: list[_Cylinder]) -> list[dict[str, Any]]:
         file that says so.
         """
         return [
-            {"time": second, "type": "gas_switch", "gas_number": cylinder.number}
+            {"time": at, "type": "gas_switch", "gas_number": cylinder.number}
             for cylinder in cylinders
-            for second in cylinder.switches
+            for at in cylinder.switches
         ]
 
 
diff --git a/divejson/uddf.py b/divejson/uddf.py
index 7f5b3af..5c20851 100644
--- a/divejson/uddf.py
+++ b/divejson/uddf.py
@@ -53,7 +53,9 @@
 carries the obligation to list its member under `extensions.divejson.inferred`; a resolution
 lists nothing, because there is no derivation for a reader to be told about. So this reader
 infers nothing and that list is absent from every document it produces, while its report
-still says out loud where it chose a scale.
+still says out loud where it chose a scale. One `resolved` finding settles a meaning rather
+than a scale: a `<surfacepressure>` on a dive linking more than one computer, which the
+file states once for the dive and this reader gives to the first (`read_recordings`).
 
 That paragraph carried a count until this reader gained a third scale. It does not carry one
 now, for the reason `docs/uddf-mapping.md`'s own heading gives: one more ambiguity is exactly
@@ -66,14 +68,13 @@
 import uuid as uuid_pkg
 import xml.etree.ElementTree as ET
 from collections.abc import Iterator
-from datetime import datetime
+from datetime import date, datetime
 from decimal import Decimal
 from typing import Any
 
 from .converter import (
     CENTIMETRES_PER_METRE,
     MAX_NAME,
-    MAX_NOTES,
     PRODUCER_KEY,
     TENTHS_PER_UNIT,
     Conversion,
@@ -89,11 +90,14 @@
     device,
     header,
     integer_of,
+    milliseconds,
     position,
     record_inferred,
     recorded,
     recording,
     rounded,
+    in_seconds,
+    shared_readout,
 )
 from .series import Channel, SampleAxis
 from .validate import validate_document
@@ -128,9 +132,9 @@
 # specifies — see `_volume_litres`.
 LITRES_THRESHOLD = Decimal(1)
 
-# `MAX_NOTES` and `MAX_NAME` are `converter.py`'s: every adapter meets those two, and
-# §6.9's `name` is one of them — a place's name shares the 255 every name in the format
-# has, and so does an insurer's. The caps below are UDDF's own, being the only reader that
+# `MAX_NAME` is `converter.py`'s: every adapter meets it, and §6.9's `name` is one of the
+# names it caps — a place's name shares the 255 every name in the format has, and so does
+# an insurer's. The caps below are UDDF's own, being the only reader that
 # fills the members they cap. §6.12's `serial` is 1-64 rather than the 255 its neighbours
 # share, and the reason is worth knowing: a gear serial longer than a device's (§6.4b) could
 # never equal one, and equality between the two is what says a kit item and a device are
@@ -380,7 +384,10 @@ def _gas_percent(raw: Decimal) -> tuple[Decimal, bool]:
 def _date_time(text: str) -> tuple[str | None, str | None]:
     """A DiveJSON date-time from `xs:dateTime` text, plus what had to be forgiven.
 
-    Returns `(value, note)`; `value` is `None` when the text is not a date and time at all.
+    Returns `(value, note)`; `value` is `None` when the text is not a date at all. **A text
+    carrying no time of day comes back as the bare date**, `2002-06-18`, and a caller that
+    wants a date-time checks for that: a dive's start may be a date alone (§5.2), and every
+    other caller takes the date off the front anyway.
 
     **The offset is preserved exactly as recorded, and never supplied.** That is §5.2's
     whole point, and converting to UTC — or assuming an offset where the source recorded
@@ -389,22 +396,26 @@ def _date_time(text: str) -> tuple[str | None, str | None]:
     The forgiven shapes are real writer output rather than hypotheticals: Subsurface emits
     a midnight dive as `<datetime>2002-06-18T</datetime>`, its XSLT building the string
     with an unguarded `concat`, and a bare date is what the same bug produces one character
-    earlier.
+    earlier — and what UDDF's own documentation calls a legal omission of the lower-order
+    elements.
     """
     match = _DATE_TIME.match(text.strip())
     if match is None:
         return None, None
 
     parts = match.groupdict()
-    note = None
     if parts["hour"] is None:
-        note = f"{text.strip()!r} records a date with no time of day; read as midnight"
-        hour, minute, second = "00", "00", "00"
-    else:
-        hour, minute, second = parts["hour"], parts["minute"], parts["second"]
-        if second is None:
-            note = f"{text.strip()!r} records no seconds; read as :00"
-            second = "00"
+        try:
+            date.fromisoformat(parts["date"])
+        except ValueError:
+            return None, None
+        return parts["date"], f"{text.strip()!r} records a date with no time of day"
+
+    note = None
+    hour, minute, second = parts["hour"], parts["minute"], parts["second"]
+    if second is None:
+        note = f"{text.strip()!r} records no seconds; read as :00"
+        second = "00"
 
     try:
         datetime.fromisoformat(f"{parts['date']}T{hour}:{minute}:{second}")
@@ -576,7 +587,7 @@ def date_of(self, element: ET.Element | None, where: str, member: str) -> str |
             return None
         return value[:10]
 
-    def notes_text(self, parent: ET.Element | None, where: str) -> str | None:
+    def notes_text(self, parent: ET.Element | None) -> str | None:
         """A `<notes>` block as one string. Its `<link>` children carry no note text."""
         notes = _kid(parent, "notes")
         if notes is None:
@@ -584,7 +595,7 @@ def notes_text(self, parent: ET.Element | None, where: str) -> str | None:
         paragraphs = [text for text in (_text(para) for para in _kids(notes, "para")) if text]
         if not paragraphs:
             return None
-        return self.capped("\n\n".join(paragraphs), MAX_NOTES, where, "the note")
+        return "\n\n".join(paragraphs)
 
     # -- geometry ----------------------------------------------------------------
 
@@ -791,7 +802,7 @@ def read_sites(self) -> list[dict[str, Any]]:
             position = self.position(geography, where)
             if position:
                 site["position"] = position
-            notes = self.notes_text(element, where)
+            notes = self.notes_text(element)
             if notes:
                 site["notes"] = notes
 
@@ -899,7 +910,7 @@ def read_trip_parts(self, element: ET.Element, where: str) -> tuple[list[dict[st
                     "dropped",
                 )
 
-            part_notes = self.notes_text(part, part_where)
+            part_notes = self.notes_text(part)
             if part_notes:
                 paragraphs.append(part_notes)
 
@@ -913,7 +924,7 @@ def read_trip_parts(self, element: ET.Element, where: str) -> tuple[list[dict[st
             if record:
                 parts.append(record)
 
-        joined = self.capped("\n\n".join(paragraphs), MAX_NOTES, where, "the trip note") if paragraphs else None
+        joined = "\n\n".join(paragraphs) if paragraphs else None
         return parts, joined
 
     # -- gear --------------------------------------------------------------------
@@ -976,7 +987,7 @@ def read_gear(self) -> list[dict[str, Any]]:
             if kind == "suit" and (_text_of(element, "suittype") or "").lower() in _DRYSUIT_TYPES:
                 gear_type = "drysuit"
             item["type"] = gear_type
-            notes = self.notes_text(element, where)
+            notes = self.notes_text(element)
             if notes:
                 item["notes"] = notes
 
@@ -1020,12 +1031,12 @@ def read_mixes(self) -> None:
                 mix.pop("oxygen", None)
                 mix.pop("helium", None)
 
-            po2_limit = decimal_of(_text_of(element, "maximumpo2"))
-            if po2_limit is not None:
-                if MIN_PO2_LIMIT <= po2_limit <= MAX_PO2_LIMIT:
-                    mix["po2_limit"] = float(po2_limit)
+            ppo2_limit = decimal_of(_text_of(element, "maximumpo2"))
+            if ppo2_limit is not None:
+                if MIN_PO2_LIMIT <= ppo2_limit <= MAX_PO2_LIMIT:
+                    mix["ppo2_limit"] = float(ppo2_limit)
                 else:
-                    self.note(where, f"<maximumpo2> is {po2_limit} bar, outside the 0.4 to 2.0 the format allows; dropped", "dropped")
+                    self.note(where, f"<maximumpo2> is {ppo2_limit} bar, outside the 0.4 to 2.0 the format allows; dropped", "dropped")
             self.mixes[source_id] = mix
 
     def read_deco_models(self) -> None:
@@ -1146,7 +1157,7 @@ def read_dive(self, element: ET.Element, index: int) -> dict[str, Any] | None:
             else:
                 self.note(where, f"<diveduration> is {duration} seconds; the format records a duration only when it is positive", "absent")
 
-        notes = self.notes_text(after, where)
+        notes = self.notes_text(after)
         if notes:
             dive["notes"] = notes
 
@@ -1195,11 +1206,14 @@ def read_dive(self, element: ET.Element, index: int) -> dict[str, Any] | None:
             else:
                 self.note(where, f"<altitude> is {altitude} m, outside the -450 to 6500 the format allows; dropped", "dropped")
 
+        # §6.4a's readout rather than a member of the dive, and it is read here only
+        # because it is a child of the dive: `read_recordings` is where it goes.
+        readouts: dict[str, float] = {}
         surface_pressure = decimal_of(_text_of(before, "surfacepressure"))
         if surface_pressure is not None:
             bar = surface_pressure / PASCAL_PER_BAR
             if MIN_SURFACE_PRESSURE <= bar <= MAX_SURFACE_PRESSURE:
-                dive["surface_pressure"] = float(bar)
+                readouts["surface_pressure"] = float(bar)
             else:
                 self.note(where, f"<surfacepressure> reads as {bar} bar, outside the 0.4 to 1.2 the format allows; dropped", "dropped")
 
@@ -1227,7 +1241,7 @@ def read_dive(self, element: ET.Element, index: int) -> dict[str, Any] | None:
         if cylinders:
             dive["cylinders"] = cylinders
         recordings = self.read_recordings(
-            before, used, profile, mode, self.read_deco_model(before, where), where
+            before, used, profile, mode, self.read_deco_model(before, where), readouts, where
         )
         if recordings:
             dive["recordings"] = recordings
@@ -1240,25 +1254,32 @@ def read_recordings(
         profile: dict[str, Any] | None,
         mode: str | None,
         model: dict[str, Any] | None,
+        readouts: dict[str, float],
         where: str,
     ) -> list[dict[str, Any]]:
         """A §6.4a Recording per `<divecomputer>` the dive links, in link order.
 
-        UDDF states a dive's `<samples>` and its `<internaldivenumber>` **once per dive**
-        and never once per computer, so both go to the first linked computer and to no
-        other: a dive linking two has one profile and one counter, and there is no way in
-        the file to say whose the counter is. Confining the counter there is also what
-        keeps the emptiness test below from circling — every later link's device is made of
-        that element's own four members and nothing the dive supplies.
-
-        The carve-out follows from those two facts rather than adding to them. The profile
-        is the only thing that carries a link past it without a device, and it reaches
-        exactly one link, so **where the dive has a profile** the first link is a recording
-        whether or not its element names a device — exactly as a dive linking no computer
-        at all is one recording made of its samples alone — and a link yielding neither a
-        device nor a profile yields nothing, §6.4a forbidding a recording that carries
-        nothing. Where the dive has no profile, every link is judged on its device alone,
-        the first included.
+        UDDF states a dive's `<samples>`, its `<internaldivenumber>` and its
+        `<surfacepressure>` **once per dive** and never once per computer, so all three go
+        to the first linked computer and to no other: a dive linking two has one profile, one
+        counter and one surface pressure, and there is no way in the file to say whose the
+        counter or the pressure is. Confining the counter there is also what keeps the
+        emptiness test below from circling — every later link's device is made of that
+        element's own four members and nothing the dive supplies.
+
+        The carve-out follows from those facts rather than adding to them. The profile and
+        the surface pressure are the only things that carry a link past it without a device,
+        and they reach exactly one link, so **where the dive has either** the first link is a
+        recording whether or not its element names a device — exactly as a dive linking no
+        computer at all is one recording made of what the dive states — and a link yielding
+        neither a device nor one of those yields nothing, §6.4a forbidding a recording that
+        carries nothing. Where the dive has neither, every link is judged on its device
+        alone, the first included.
+
+        **The surface pressure on a dive with two recordings is `resolved`** rather than
+        silent: it is one computer's figure (§6.4a) and the file does not say whose, so
+        giving it to the first is a reading of its meaning, which `docs/converting.md` asks a
+        reader to report.
         """
         counter = integer_of(decimal_of(_text_of(before, "internaldivenumber")))
         linked = [
@@ -1274,7 +1295,7 @@ def read_recordings(
                     "to belong to, so there is no device to carry it; dropped (spec §6.4b)",
                     "dropped",
                 )
-            built = recording(profile=profile, mode=mode, deco_model=model)
+            built = recording(profile=profile, mode=mode, deco_model=model, readouts=readouts)
             return [built] if built is not None else []
 
         recordings: list[dict[str, Any]] = []
@@ -1287,10 +1308,13 @@ def read_recordings(
                 # two computers has no way in the file to say whose either is.
                 mode=mode if index == 0 else None,
                 deco_model=model if index == 0 else None,
+                readouts=readouts if index == 0 else None,
                 profile=profile if index == 0 else None,
             )
             if built is not None:
                 recordings.append(built)
+        if readouts and len(recordings) > 1:
+            self.note(where, shared_readout("<surfacepressure>", len(recordings)), "resolved")
         return recordings
 
     def read_device(
@@ -1347,6 +1371,15 @@ def read_started_at(self, before: ET.Element | None, where: str) -> str | None:
         if started_at is None:
             self.note(where, f"<datetime> is {raw!r}, which is not a date and time; the dive is dropped (spec §6.2)", "dropped")
             return None
+        if "T" not in started_at:
+            # A date-only start (§5.2): the day was recorded and the time of day was not,
+            # and midnight would be a time the file never stated. An offset beside a bare
+            # date has nowhere to go, a date carrying none.
+            self.note(where, f"{forgiven}; read as a date-only start rather than as midnight (spec §5.2)", "absent")
+            stated = _DATE_TIME.match(raw.strip())
+            if stated is not None and stated["offset"] is not None:
+                self.note(where, f"{raw.strip()!r} records a UTC offset beside a date alone, which a date cannot carry; dropped", "dropped")
+            return started_at
         if forgiven:
             self.note(where, forgiven, "absent")
         if self.local_clock_with_z and started_at.endswith(("Z", "z")):
@@ -1509,7 +1542,7 @@ def read_profile(
         temperatures rather than padding the second to match the first.
 
         The axis itself — the ordering, the dropped and reported waypoints, the two on one
-        second, the profile that is not written at all — is `series.SampleAxis`, shared
+        millisecond, the profile that is not written at all — is `series.SampleAxis`, shared
         with every other format, and only what is UDDF's is below: which element carries
         which channel, and what a `<tankpressure ref>` resolves to.
 
@@ -1522,9 +1555,12 @@ def read_profile(
         if samples is None:
             return None, False, None
 
+        # `<divetime>` is `xs:float` seconds, and a fraction it states keeps its place on the
+        # millisecond axis: `legacy-writer.uddf`'s `30` and `30.4` share a second and are
+        # two instants here, both kept.
         axis = SampleAxis(self.note, where, noun="waypoint", time_member="<divetime>")
         for waypoint in _kids(samples, "waypoint"):
-            axis.offer(integer_of(decimal_of(_text_of(waypoint, "divetime"))), waypoint)
+            axis.offer(milliseconds(decimal_of(_text_of(waypoint, "divetime"))), waypoint)
 
         cylinders_of_mix: dict[str, list[int]] = {}
         for index, ref in enumerate(mix_refs):
@@ -1543,21 +1579,22 @@ def read_profile(
         mode: str | None = None
         reported_pascal_po2 = False
 
-        for second, waypoint in axis.ordered():
+        for at, waypoint in axis.ordered():
             metres = decimal_of(_text_of(waypoint, "depth"))
             if metres is not None:
-                depth.record(second, rounded(metres * CENTIMETRES_PER_METRE))
+                depth.record(at, rounded(metres * CENTIMETRES_PER_METRE))
 
             kelvin = decimal_of(_text_of(waypoint, "temperature"))
             if kelvin is not None:
-                temperature.record(second, rounded((kelvin - KELVIN_OFFSET) * TENTHS_PER_UNIT))
+                temperature.record(at, rounded((kelvin - KELVIN_OFFSET) * TENTHS_PER_UNIT))
 
-            # Seconds already, which is §6.4's unit. A value at the device's display cap —
+            # Seconds already, which is §6.4's unit for the reading — the axis it sits on
+            # is milliseconds, the value is not. A value at the device's display cap —
             # 5 940, the Shearwater's 99 minutes — is a reading rather than a missing one:
             # it means *at least this*, which is the number the diver read off their wrist.
             seconds = decimal_of(_text_of(waypoint, "nodecotime"))
             if seconds is not None:
-                ndl.record(second, rounded(seconds))
+                ndl.record(at, rounded(seconds))
 
             po2, in_pascal = self.po2_hundredths(_text_of(waypoint, "calculatedpo2"))
             if po2 is not None:
@@ -1569,43 +1606,43 @@ def read_profile(
                         "resolved",
                     )
                     reported_pascal_po2 = True
-                ppo2.record(second, po2)
+                ppo2.record(at, po2)
 
             percent = decimal_of(_text_of(waypoint, "cns"))
             if percent is not None:
-                cns.record(second, rounded(percent * TENTHS_PER_UNIT))
+                cns.record(at, rounded(percent * TENTHS_PER_UNIT))
 
             factor = self.gradient_factor(waypoint)
             if factor is not None:
-                gradient_factor.record(second, factor)
+                gradient_factor.record(at, factor)
 
-            mode = self.waypoint_mode(waypoint, mode, second, where)
+            mode = self.waypoint_mode(waypoint, mode, at, where)
 
-            for cylinder_index, tenths in self.waypoint_pressures(waypoint, where, second, cylinders_of_mix, len(mix_refs)):
+            for cylinder_index, tenths in self.waypoint_pressures(waypoint, where, at, cylinders_of_mix, len(mix_refs)):
                 channel = pressures.setdefault(cylinder_index, Channel("pressures"))
                 # Asked before the reading is offered rather than read off `record`'s
                 # answer, which has two refusals in it: a pressure channel carries no floor
                 # and so can only be refused for the second, but a caller that reported a
                 # floor refusal as a collision would be saying the wrong thing quietly.
-                if channel.taken(second):
-                    self.note(where, f"two tank pressures at {second} s resolve to the same cylinder; the later one is dropped", "dropped")
+                if channel.taken(at):
+                    self.note(where, f"two tank pressures at {in_seconds(at)} s resolve to the same cylinder; the later one is dropped", "dropped")
                     continue
-                channel.record(second, tenths)
+                channel.record(at, tenths)
                 needs_gas_numbers = True
 
             marker = _text_of(waypoint, "setmarker")
             if marker is not None:
                 if marker in _MARKER_TYPES:
-                    events.append({"time": second, "type": marker})
+                    events.append({"time": at, "type": marker})
                 else:
                     # No `type` at all, which §6.6 makes the spelling of an unclassified
                     # event: `<setmarker>` is a bare string with no type beside it, and the
                     # device's own wording is all this one has.
-                    events.append({"time": second, "label": marker})
+                    events.append({"time": at, "label": marker})
 
             switch = _kid(waypoint, "switchmix")
             if switch is not None:
-                event: dict[str, Any] = {"time": second, "type": "gas_switch"}
+                event: dict[str, Any] = {"time": at, "type": "gas_switch"}
                 ref = _attr(switch, "ref")
                 if ref is not None and ref in cylinders_of_mix:
                     event["gas_number"] = cylinders_of_mix[ref][0]
@@ -1613,7 +1650,7 @@ def read_profile(
                 elif ref is not None:
                     self.note(
                         where,
-                        f"a gas switch at {second} s names the gas {ref!r}, which no cylinder on this dive links "
+                        f"a gas switch at {in_seconds(at)} s names the gas {ref!r}, which no cylinder on this dive links "
                         "to; the switch is kept without saying what it was to (spec §6.6)",
                         "absent",
                     )
@@ -1651,7 +1688,7 @@ def po2_hundredths(self, text: str | None) -> tuple[int | None, bool]:
         return rounded(value / PASCAL_PER_PO2_HUNDREDTH), True
 
     def waypoint_mode(
-        self, waypoint: ET.Element, standing: str | None, second: int, where: str
+        self, waypoint: ET.Element, standing: str | None, at: int, where: str
     ) -> str | None:
         """One waypoint's `<divemode @type>` against the mode the recording already has.
 
@@ -1691,7 +1728,7 @@ def waypoint_mode(
         if mode != standing:
             self.note(
                 where,
-                f"the dive mode changes to {stated!r} at {second} s, and §6.4a records one mode for a "
+                f"the dive mode changes to {stated!r} at {in_seconds(at)} s, and §6.4a records one mode for a "
                 "recording; the change is dropped, there being no event a converter could label without "
                 "inventing the device's wording (spec §5.4)",
                 "dropped",
@@ -1702,7 +1739,7 @@ def waypoint_pressures(
         self,
         waypoint: ET.Element,
         where: str,
-        second: int,
+        at: int,
         cylinders_of_mix: dict[str, list[int]],
         tank_count: int,
     ) -> Iterator[tuple[int, int]]:
@@ -1727,7 +1764,7 @@ def waypoint_pressures(
                 if tank_count != 1:
                     self.note(
                         where,
-                        f"a tank pressure at {second} s names no cylinder, and the dive has {tank_count}; the "
+                        f"a tank pressure at {in_seconds(at)} s names no cylinder, and the dive has {tank_count}; the "
                         "reading is dropped rather than guessed onto one",
                         "dropped",
                     )
@@ -1740,7 +1777,7 @@ def waypoint_pressures(
                 if position >= len(candidates):
                     self.note(
                         where,
-                        f"a tank pressure at {second} s names the gas {ref!r}, which no further cylinder on this "
+                        f"a tank pressure at {in_seconds(at)} s names the gas {ref!r}, which no further cylinder on this "
                         "dive links to; the reading is dropped",
                         "dropped",
                     )
diff --git a/divejson/uddf_write.py b/divejson/uddf_write.py
index 28f5d65..d0fe6ec 100644
--- a/divejson/uddf_write.py
+++ b/divejson/uddf_write.py
@@ -57,13 +57,19 @@
 sidemount pair on one blend would come back with its two pressure channels crossed the
 moment one of them missed a waypoint the other had.
 
-**Every reading keeps its own second.** UDDF puts everything recorded at one instant inside
+**Every reading keeps its own instant.** UDDF puts everything recorded at one instant inside
 one `<waypoint>`, so the waypoints here are the union of every channel's times and a
-waypoint carries only what was actually measured at that second. The reference writer snaps
+waypoint carries only what was actually measured at that instant. The reference writer snaps
 its other channels onto the depth axis instead and drops what cannot reach one, because two
 importers mishandle a depth-less waypoint in opposite ways — a real constraint on a file
 written for those two, and the wrong trade for a file written to be read back. What that
 costs a consumer is in `docs/uddf-writing.md` under *Known consumer artefacts*.
+
+**`<divetime>` is `xs:float` seconds and the axis is milliseconds**, so a time goes out
+divided by a thousand in decimal: a whole second as the integer it is, so a document whose
+samples all fall on whole seconds writes no fraction at all, and a millisecond that is not
+one as seconds with the fraction — `1200.02` — which the reader multiplies back to exactly
+`1200020`.
 """
 
 from __future__ import annotations
@@ -77,10 +83,12 @@
 from .converter import (
     CENTIMETRES_PER_METRE,
     GENERATOR_NAME,
+    MILLISECONDS_PER_SECOND,
     TENTHS_PER_UNIT,
     Note,
     NoteKind,
     Written,
+    in_seconds,
 )
 from .uddf import (
     FORMAT,
@@ -200,8 +208,8 @@
 HUNDREDTHS_PER_UNIT = Decimal(100)
 PERCENT_PER_FRACTION = Decimal(100)
 
-# What one dive's waypoints are collected into before they are written: a second, and the
-# readings and annotations that landed on it. UDDF's `<waypoint>` is the one instant every
+# What one dive's waypoints are collected into before they are written: a millisecond on the
+# axis, and the readings and annotations that landed on it. UDDF's `<waypoint>` is the one instant every
 # channel has to be folded back into, so the fold happens here and the elements come out of
 # it in the schema's order.
 _Readings = dict[int, dict[str, Any]]
@@ -304,7 +312,7 @@ def _person_names(name: str) -> tuple[str, str]:
 class _MixKey:
     """What makes two cylinders the same `<mix>`: the blend and the limit planned for it.
 
-    `po2_limit` is part of the key rather than of the payload alone, because it maps onto
+    `ppo2_limit` is part of the key rather than of the payload alone, because it maps onto
     `<mix><maximumpo2>` — a diver carrying the same EAN32 planned to 1.4 on the bottom and
     1.6 on the ascent has defined two mixes as far as UDDF is concerned, and collapsing them
     would mean picking one limit and dropping the other. An unrecorded fraction is a key
@@ -314,7 +322,7 @@ class _MixKey:
 
     oxygen: Decimal | None
     helium: Decimal | None
-    po2_limit: Decimal | None
+    ppo2_limit: Decimal | None
 
     @property
     def sort_key(self) -> tuple[Decimal, Decimal, Decimal]:
@@ -325,7 +333,7 @@ def sort_key(self) -> tuple[Decimal, Decimal, Decimal]:
         return (
             absent if self.oxygen is None else self.oxygen,
             absent if self.helium is None else self.helium,
-            absent if self.po2_limit is None else self.po2_limit,
+            absent if self.ppo2_limit is None else self.ppo2_limit,
         )
 
 
@@ -333,7 +341,7 @@ def _mix_key(cylinder: dict[str, Any]) -> _MixKey:
     return _MixKey(
         oxygen=None if cylinder.get("oxygen") is None else _decimal(cylinder["oxygen"]),
         helium=None if cylinder.get("helium") is None else _decimal(cylinder["helium"]),
-        po2_limit=None if cylinder.get("po2_limit") is None else _decimal(cylinder["po2_limit"]),
+        ppo2_limit=None if cylinder.get("ppo2_limit") is None else _decimal(cylinder["ppo2_limit"]),
     )
 
 
@@ -1142,9 +1150,9 @@ def gasdefinitions_element(self) -> ET.Element | None:
                 _sub(mix, "o2", _num(key.oxygen / 100))
             if key.helium is not None:
                 _sub(mix, "he", _num(key.helium / 100))
-            if key.po2_limit is not None:
+            if key.ppo2_limit is not None:
                 # Bar in both formats — the one pressure UDDF does *not* express in Pascal.
-                _sub(mix, "maximumpo2", _num(key.po2_limit))
+                _sub(mix, "maximumpo2", _num(key.ppo2_limit))
         return gasdefinitions
 
     # -- dives -------------------------------------------------------------------
@@ -1185,7 +1193,6 @@ def dive_element(self, dive: dict[str, Any], index: int) -> ET.Element:
                     "visibility",
                     "weight",
                     "altitude",
-                    "surface_pressure",
                     "trip_uuid",
                     "site_uuids",
                     "gear_uuids",
@@ -1218,6 +1225,11 @@ def dive_element(self, dive: dict[str, Any], index: int) -> ET.Element:
                     "dropped",
                 )
         self.internal_dive_number(before, recordings, where)
+        # Exactly as recorded, a date-only start included: `<datetime>2002-06-18</datetime>`
+        # is the bare date UDDF's own documentation calls a legal omission of the lower-order
+        # elements, though its XSD types the element `xs:dateTime`. Midnight would be a time
+        # the document never had, and the reader takes the bare date back as the date it was
+        # (`docs/uddf-writing.md`), so nothing is lost and nothing is reported.
         _sub(before, "datetime", str(dive["started_at"]))
         _optional(before, "altitude", dive.get("altitude"))
         weight, gear_uuids = dive.get("weight"), dive.get("gear_uuids") or []
@@ -1240,8 +1252,12 @@ def dive_element(self, dive: dict[str, Any], index: int) -> ET.Element:
         self.check_link_order(index, recordings, gear_uuids, devices, where)
         if dive.get("trip_uuid"):
             _sub(before, "tripmembership", ref=_uddf_id("trip", dive["trip_uuid"]))
-        if dive.get("surface_pressure") is not None:
-            _sub(before, "surfacepressure", _num(_decimal(dive["surface_pressure"]) * PASCAL_PER_BAR))
+        # UDDF states one surface pressure per dive, so it is the **primary** recording's
+        # (§6.4a) — the one the reader gives it back to — and a later recording's goes with
+        # that recording, which `recording_elements` reports dropped.
+        surface_pressure = recordings[0].get("surface_pressure") if recordings else None
+        if surface_pressure is not None:
+            _sub(before, "surfacepressure", _num(_decimal(surface_pressure) * PASCAL_PER_BAR))
 
         mix_by_gas_number, declared = self.tankdata_elements(element, dive, where)
         numbered = self.recording_elements(element, recordings, where, mix_by_gas_number)
@@ -1432,11 +1448,12 @@ def recording_elements(
         numbered = False
         for index, entry in enumerate(recordings):
             here = f"{where}/recordings/{index}"
-            # `device`, `mode` and `profile` are the three this writer places, and
+            # `device`, `mode`, `profile` and the surface pressure are the four this writer
+            # places, the last on the dive's `<surfacepressure>` (`dive_element`), and
             # `deco_model` is in the set because it has a report of its own below rather than
-            # the generic one; `started_at`, `source_files` and anything §6.4a gains report
-            # themselves from the record.
-            self.unmapped(here, entry, frozenset({"device", "mode", "deco_model", "profile"}))
+            # the generic one; `salinity`, the oxygen clocks, `started_at`, `source_files` and
+            # anything §6.4a gains report themselves from the record.
+            self.unmapped(here, entry, frozenset({"device", "mode", "deco_model", "surface_pressure", "profile"}))
             if entry.get("deco_model"):
                 self.note(
                     f"{here}/deco_model",
@@ -1475,7 +1492,7 @@ def tankdata_elements(
             self.unmapped(
                 cylinder_where,
                 cylinder,
-                frozenset({"volume", "start_pressure", "end_pressure", "oxygen", "helium", "po2_limit", "gas_number"}),
+                frozenset({"volume", "start_pressure", "end_pressure", "oxygen", "helium", "ppo2_limit", "gas_number"}),
             )
             key = _mix_key(cylinder)
             occurrence = seen.get(key, 0)
@@ -1544,7 +1561,7 @@ def samples_element(
     ) -> bool:
         """`<samples>`, and whether what was written asks a reader for a gas numbering.
 
-        One waypoint per second any channel or event landed on — the union rather than the
+        One waypoint per instant any channel or event landed on — the union rather than the
         depth channel's axis, see the module docstring — so a temperature taken between two
         depth samples becomes its own waypoint, carrying a `<divetime>` and a
         `<temperature>` and no depth.
@@ -1583,26 +1600,26 @@ def samples_element(
 
         readings: _Readings = {}
 
-        def at(second: int) -> dict[str, Any]:
-            return readings.setdefault(second, {"pressures": []})
-
-        for second, centimetres in _series(profile.get("depth")):
-            at(second)["depth"] = _decimal(centimetres) / CENTIMETRES_PER_METRE
-        for second, tenths in _series(profile.get("temperature")):
-            at(second)["temperature"] = _decimal(tenths) / TENTHS_PER_UNIT + KELVIN_OFFSET
-        for second, seconds in _series(profile.get("ndl")):
-            at(second)["nodecotime"] = _decimal(seconds)
-        for second, hundredths in _series(profile.get("ppo2")):
-            at(second)["calculatedpo2"] = _decimal(hundredths) / HUNDREDTHS_PER_UNIT
-        for second, tenths in _series(profile.get("cns")):
-            at(second)["cns"] = _decimal(tenths) / TENTHS_PER_UNIT
+        def at(instant: int) -> dict[str, Any]:
+            return readings.setdefault(instant, {"pressures": []})
+
+        for instant, centimetres in _series(profile.get("depth")):
+            at(instant)["depth"] = _decimal(centimetres) / CENTIMETRES_PER_METRE
+        for instant, tenths in _series(profile.get("temperature")):
+            at(instant)["temperature"] = _decimal(tenths) / TENTHS_PER_UNIT + KELVIN_OFFSET
+        for instant, seconds in _series(profile.get("ndl")):
+            at(instant)["nodecotime"] = _decimal(seconds)
+        for instant, hundredths in _series(profile.get("ppo2")):
+            at(instant)["calculatedpo2"] = _decimal(hundredths) / HUNDREDTHS_PER_UNIT
+        for instant, tenths in _series(profile.get("cns")):
+            at(instant)["cns"] = _decimal(tenths) / TENTHS_PER_UNIT
         # **The documented fraction, not the whole percent §6.4 records.** `uddf-mapping.md`
         # keys the percent-or-fraction question on the generator, and this writer is not a
         # generator that table names — it stamps `divejson convert` — so a file it produces
         # is read back by the fraction branch, and a written `0.67` comes back as `67`.
         # Writing whole percent would come back as `6700`.
-        for second, percent in _series(profile.get("gradient_factor")):
-            at(second)["gradientfactor"] = _decimal(percent) / PERCENT_PER_FRACTION
+        for instant, percent in _series(profile.get("gradient_factor")):
+            at(instant)["gradientfactor"] = _decimal(percent) / PERCENT_PER_FRACTION
 
         for channel in profile.get("pressures") or []:
             mix_id = mix_by_gas_number.get(channel["gas_number"])
@@ -1616,8 +1633,8 @@ def at(second: int) -> dict[str, Any]:
                     "dropped",
                 )
                 continue
-            for second, tenths in _series(channel):
-                at(second)["pressures"].append((mix_id, _decimal(tenths) / TENTHS_PER_UNIT * PASCAL_PER_BAR))
+            for instant, tenths in _series(channel):
+                at(instant)["pressures"].append((mix_id, _decimal(tenths) / TENTHS_PER_UNIT * PASCAL_PER_BAR))
 
         self.events(profile.get("events") or [], profile_where, mix_by_gas_number, readings)
 
@@ -1626,8 +1643,8 @@ def at(second: int) -> dict[str, Any]:
             return False
         first = min(readings)
         samples = _sub(element, "samples")
-        for second in sorted(readings):
-            reading = readings[second]
+        for instant in sorted(readings):
+            reading = readings[instant]
             # `waypointType` is an `xs:sequence`, so these go in exactly this order. It is
             # the XSD's and not a preference: `<cns>` comes third in the type and therefore
             # first in a waypoint carrying no alarm or battery reading, and `<nodecotime>` is
@@ -1639,7 +1656,7 @@ def at(second: int) -> dict[str, Any]:
                 _sub(waypoint, "calculatedpo2", _num(reading["calculatedpo2"]))
             if "depth" in reading:
                 _sub(waypoint, "depth", _num(reading["depth"]))
-            _sub(waypoint, "divetime", _num(second))
+            _sub(waypoint, "divetime", _num(_decimal(instant) / MILLISECONDS_PER_SECOND))
             if "setmarker" in reading:
                 _sub(waypoint, "setmarker", reading["setmarker"])
             if "switchmix" in reading:
@@ -1648,7 +1665,7 @@ def at(second: int) -> dict[str, Any]:
                 _sub(waypoint, "tankpressure", _num(pascal), ref=mix_id)
             if "temperature" in reading:
                 _sub(waypoint, "temperature", _num(reading["temperature"]))
-            if divemode is not None and second == first:
+            if divemode is not None and instant == first:
                 _sub(waypoint, "divemode", type=divemode)
             if "gradientfactor" in reading:
                 _sub(waypoint, "gradientfactor", _num(reading["gradientfactor"]))
@@ -1681,7 +1698,8 @@ def at(second: int) -> dict[str, Any]:
             # UDDF has no profile-level duration at all.
             self.note(
                 profile_where,
-                f"the profile's duration is {profile.get('duration')} s where its samples span {span} s, and "
+                f"the profile's duration is {in_seconds(profile.get('duration') or 0)} s where its samples span "
+                f"{in_seconds(span)} s, and "
                 "UDDF records no duration for a profile; a reader takes the span (spec §6.4)",
                 "dropped",
             )
@@ -1741,13 +1759,13 @@ def events(
         carrying that label, exactly as it arrived. What UDDF can carry is the wording.
         """
 
-        def at(second: int) -> dict[str, Any]:
-            return readings.setdefault(second, {"pressures": []})
+        def at(instant: int) -> dict[str, Any]:
+            return readings.setdefault(instant, {"pressures": []})
 
         for index, event in enumerate(events):
             event_where = f"{where}/events/{index}"
             self.unmapped(event_where, event, frozenset({"time", "type", "gas_number", "label"}))
-            second = event["time"]
+            instant = event["time"]
             kind = event.get("type")
             if kind == "gas_switch":
                 # A switch the document recorded without saying what to, and one naming a
@@ -1763,15 +1781,15 @@ def at(second: int) -> dict[str, Any]:
                         "dropped",
                     )
                     continue
-                if "switchmix" in readings.get(second, {}):
+                if "switchmix" in readings.get(instant, {}):
                     self.note(
                         event_where,
-                        f"a gas switch at {second} s shares its second with an earlier one, and a waypoint "
-                        "carries one <switchmix>; the later switch is dropped",
+                        f"a gas switch at {in_seconds(instant)} s shares its instant with an earlier one, and a "
+                        "waypoint carries one <switchmix>; the later switch is dropped",
                         "dropped",
                     )
                     continue
-                at(second)["switchmix"] = mix_id
+                at(instant)["switchmix"] = mix_id
                 continue
 
             label = event.get("label")
@@ -1811,19 +1829,19 @@ def at(second: int) -> dict[str, Any]:
                     "dropped",
                 )
                 continue
-            if "setmarker" in readings.get(second, {}):
+            if "setmarker" in readings.get(instant, {}):
                 self.note(
                     event_where,
-                    f"an event at {second} s shares its second with an earlier one, and a waypoint carries one "
-                    "<setmarker>; the later event is dropped",
+                    f"an event at {in_seconds(instant)} s shares its instant with an earlier one, and a waypoint "
+                    "carries one <setmarker>; the later event is dropped",
                     "dropped",
                 )
                 continue
-            at(second)["setmarker"] = str(marker)
+            at(instant)["setmarker"] = str(marker)
 
 
 def _series(channel: Any) -> list[tuple[int, int]]:
-    """A §6.5 channel as `(second, value)` pairs, in the order it stores them.
+    """A §6.5 channel as `(millisecond, value)` pairs, in the order it stores them.
 
     `strict`, because §6.5 makes the two arrays the same length and the validator enforces
     it: a mismatch here is a caller handing this writer a document it never validated, and
diff --git a/divejson/validate.py b/divejson/validate.py
index 4ca6226..a81d1a6 100644
--- a/divejson/validate.py
+++ b/divejson/validate.py
@@ -3,9 +3,13 @@
 Two passes, mirroring §3 of the specification: the JSON Schema (types, required members,
 enums, ranges, lengths, and the structural rules like Position objects), then the
 semantic requirements the schema cannot express — identifier uniqueness, referential
-closure, cross-member arithmetic, profile-series integrity and span, the offset
-requirement on ``exported_at``, and the member-order rule, checked on the parsed
-document's key order (which JSON parsing preserves).
+closure, cross-member arithmetic, profile-series integrity and span, what a recording
+carries, the offset requirement on ``exported_at``, and the gradient-factor order.
+
+§4's member order is a SHOULD, not a requirement on the document: a generic
+re-serialisation commonly sorts an object's members, and a document it produced is as
+conforming as the one it read. So nothing here looks at the order of any object's members,
+and a document that validates in one order validates in every order.
 
 Null is not a spelling of absence in this format (spec §5.4): the schema rejects it, so
 the semantic checks below simply treat a missing member as missing.
@@ -16,7 +20,7 @@
 import json
 import re
 from dataclasses import dataclass
-from datetime import datetime
+from datetime import date, datetime
 from pathlib import Path
 from typing import Any
 
@@ -96,10 +100,8 @@ def load_schema(minor: str = SPEC_VERSION) -> dict[str, Any]:
 def validate_document(doc: Any, raw: str | None = None) -> list[Issue]:
     """Validate one parsed document; an empty result means conforming.
 
-    ``raw`` is accepted for compatibility and unused: ``json.loads`` preserves the
-    text's member order in the parsed dict, so the member-order rule (spec §4) is
-    checked against ``doc`` itself — which also cannot be fooled by the words
-    "format" or "version" appearing inside some string value.
+    ``raw`` is accepted for compatibility and unused: nothing §3 lists is a property of
+    the text rather than of the parsed document.
     """
     if not isinstance(doc, dict):
         return [Issue("$", "a DiveJSON document is a JSON object")]
@@ -119,23 +121,11 @@ def validate_document(doc: Any, raw: str | None = None) -> list[Issue]:
         if major != SPEC_VERSION.split(".", 1)[0]:
             return issues
 
-    issues.extend(_member_order_issues(doc))
     issues.extend(_schema_issues(doc))
     issues.extend(_semantic_issues(doc))
     return issues
 
 
-def _member_order_issues(doc: dict[str, Any]) -> list[Issue]:
-    keys = list(doc)
-    if not keys:
-        return []
-    if keys[0] != "format":
-        return [Issue("$", f'the first member is "{keys[0]}"; "format" MUST come first (spec §4)')]
-    if len(keys) > 1 and keys[1] != "version":
-        return [Issue("$", f'the second member is "{keys[1]}"; "version" MUST come second (spec §4)')]
-    return []
-
-
 def _schema_issues(doc: dict[str, Any]) -> list[Issue]:
     validator = Draft202012Validator(load_schema(), format_checker=FormatChecker())
     issues = []
@@ -165,6 +155,16 @@ def _schema_issues(doc: dict[str, Any]) -> list[Issue]:
     "surface_gradient_factor",
 )
 
+# §6.4a's readouts: the figures a device computed and showed, which live on its recording
+# and each of which is enough, alone, to make one (§3 rule 4). Read by the converters too,
+# which is why the list lives here rather than beside the one check that uses it.
+READOUTS = ("surface_pressure", "cns_start", "cns_end", "otu_start", "otu_end")
+
+# What §3's rule 4 accepts as the content of a recording. `mode`, `deco_model` and
+# `salinity` are settings and are not on it: a setting nothing recorded a dive with
+# describes no record of one.
+RECORDING_CONTENT = ("device", "profile", "source_files", *READOUTS)
+
 
 def _present(obj: dict[str, Any], member: str) -> bool:
     return obj.get(member) is not None
@@ -234,7 +234,9 @@ def _semantic_issues(doc: dict[str, Any]) -> list[Issue]:
 
     for index, dive in enumerate(collections["dives"]):
         here = f"dives/{index}"
-        _check_datetime(dive, "started_at", here, issues)
+        # The one member that may hold a date as well as a date-time (§5.2): a source that
+        # recorded the day and not the time of day.
+        _check_datetime(dive, "started_at", here, issues, allow_date=True)
         if _present(dive, "avg_depth") and _present(dive, "max_depth"):
             try:
                 if dive["avg_depth"] > dive["max_depth"]:
@@ -276,17 +278,16 @@ def _semantic_issues(doc: dict[str, Any]) -> list[Issue]:
             for file_index, stored in enumerate(recording.get("source_files") or []):
                 if isinstance(stored, dict):
                     _claim_uuid(stored, f"{rec_path}/source_files/{file_index}", seen_uuids, issues)
-            if not any(
-                _present(recording, member) for member in ("device", "profile", "source_files")
-            ):
+            if not any(_present(recording, member) for member in RECORDING_CONTENT):
                 issues.append(
                     Issue(
                         rec_path,
-                        "a recording carries at least one of device, profile and source_files "
+                        "a recording carries at least one of device, profile, source_files and a "
+                        "readout — surface_pressure, cns_start, cns_end, otu_start, otu_end "
                         "(spec §3, §6.4a)",
                     )
                 )
-            # §3 rule 7. The schema makes the pair both-or-neither and puts each on 0-100,
+            # §3 rule 6. The schema makes the pair both-or-neither and puts each on 0-100,
             # and neither of those can say that one is not above the other — which is UDDF's
             # own constraint on the same pair, and the reason a low above a high is a
             # decompression model nothing ran.
@@ -451,6 +452,7 @@ def _check_series(series: dict[str, Any], path: str, issues: list[Issue]) -> int
 _DATE_TIME = re.compile(
     r"^(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2})(\.\d+)?([Zz]|[+-]\d{2}:\d{2})?\Z"
 )
+_DATE = re.compile(r"^\d{4}-\d{2}-\d{2}\Z")
 
 
 def _check_datetime(
@@ -459,14 +461,22 @@ def _check_datetime(
     path: str,
     issues: list[Issue],
     require_offset: bool = False,
+    allow_date: bool = False,
 ) -> None:
     value = obj.get(member)
     if not isinstance(value, str):
         return
     where = f"{path}/{member}" if path else member
+    if allow_date and _DATE.match(value):
+        try:
+            date.fromisoformat(value)
+        except ValueError:
+            issues.append(Issue(where, f"{value!r} is not a real calendar date"))
+        return
     match = _DATE_TIME.match(value)
     if not match:
-        issues.append(Issue(where, f"{value!r} is not a DiveJSON date-time"))
+        kind = "date-time or date" if allow_date else "date-time"
+        issues.append(Issue(where, f"{value!r} is not a DiveJSON {kind}"))
         return
     base, fraction, offset = match.groups()
     # Normalize before the calendar check: fromisoformat is case-sensitive about Z
diff --git a/tests/helpers.py b/tests/helpers.py
index 21289e5..2f57bea 100644
--- a/tests/helpers.py
+++ b/tests/helpers.py
@@ -11,6 +11,8 @@
 from __future__ import annotations
 
 import json
+import re
+import xml.etree.ElementTree as ET
 from datetime import datetime, timedelta, timezone
 from pathlib import Path
 
@@ -80,6 +82,28 @@ def one_dive(
     )
 
 
+def for_the_xsd(text: str) -> str:
+    """UDDF text with a dive's bare `<datetime>` widened to midnight, for the XSD's pass alone.
+
+    `docs/uddf-writing.md` writes a date-only start as `<datetime>2002-06-18</datetime>`, UDDF's
+    documentation allowing the lower-order elements to be omitted while its XSD types the
+    element `xs:dateTime`. The validation pass exists to catch element order and a mandatory
+    child left out, and a date's spelling is neither — so the **spelling** is widened here
+    rather than the element exempted, which would blind the pass to both. Only a dive's own
+    `<informationbeforedive><datetime>` is touched: every other date-time this writer emits
+    is one already.
+    """
+    root = ET.fromstring(text)
+    for before in root.iter(f"{{{UDDF_NAMESPACE}}}informationbeforedive"):
+        stamp = before.find(f"{{{UDDF_NAMESPACE}}}datetime")
+        if stamp is not None and stamp.text is not None and _BARE_DATE.fullmatch(stamp.text):
+            stamp.text = f"{stamp.text}T00:00:00"
+    return ET.tostring(root, encoding="unicode")
+
+
+_BARE_DATE = re.compile(r"\d{4}-\d{2}-\d{2}")
+
+
 # -- Subsurface `.ssrf` ---------------------------------------------------------------
 
 # The `@date`/`@time` pair every `.ssrf` dive needs, being the same instant the UDDF helper
diff --git a/tests/test_converter.py b/tests/test_converter.py
index de6ebef..01316ce 100644
--- a/tests/test_converter.py
+++ b/tests/test_converter.py
@@ -10,6 +10,7 @@
 
 from datetime import datetime, timezone
 from decimal import Decimal
+from typing import Any
 
 import pytest
 
@@ -23,6 +24,9 @@
     channel_floor,
     deco_model,
     header,
+    in_seconds,
+    milliseconds,
+    onto_primary,
     profile_members,
     record_inferred,
     recorded,
@@ -169,7 +173,10 @@ def test_the_header_opens_with_the_two_members_section_4_requires_first() -> Non
         ("cylinder", "oxygen", True),
         # A floor above zero: a zero is below it, so it is no more an answer than a
         # placeholder is.
-        ("dive", "surface_pressure", False),
+        ("recording", "surface_pressure", False),
+        # A readout's clock starts at zero, which a first dive of the day reads.
+        ("recording", "cns_start", True),
+        ("recording", "otu_end", True),
     ],
 )
 def test_a_zero_reads_the_way_the_schema_constrains_the_member(record: str, member: str, answer: bool) -> None:
@@ -278,31 +285,132 @@ def test_a_boolean_is_not_an_integer_here() -> None:
 # -- §6.4a's Recording -----------------------------------------------------------------
 
 
-def test_a_mode_or_a_model_alone_does_not_make_a_recording() -> None:
-    """§3's rule 4 names `device`, `profile` and `source_files`, and neither of the two
-    members §6.4a gained is one of them — a recording built from a mode alone would emit
+def test_a_setting_alone_does_not_make_a_recording() -> None:
+    """§3's rule 4 names `device`, `profile`, `source_files` and a readout, and none of the
+    three settings is one of them — a recording built from a mode alone would emit
     `recordings: [{}]`'s conforming twin and describe no record of a dive at all."""
-    assert recording(mode="gauge", deco_model={"conservatism": 0}) is None
+    assert recording(mode="gauge", deco_model={"conservatism": 0}, salinity="en13319") is None
     assert recording(mode="gauge", device={"model": "Perdix 3"}) == {
         "device": {"model": "Perdix 3"},
         "mode": "gauge",
     }
 
 
+def test_a_readout_alone_makes_a_recording_and_a_zero_one_counts() -> None:
+    """The CNS figure a diver copied off their computer is a record of the dive (§6.4a), and
+    the zero a first dive of the day starts on is a figure, not an absence."""
+    assert recording(readouts={"cns_end": 0.0}) == {"cns_end": 0.0}
+    assert recording(salinity="salt", readouts={"surface_pressure": 1.013}) == {
+        "salinity": "salt",
+        "surface_pressure": 1.013,
+    }
+
+
+def test_a_member_that_is_not_a_readout_is_refused_as_one() -> None:
+    with pytest.raises(KeyError):
+        recording(readouts={"water_type": 1.0})
+
+
 def test_the_recordings_members_come_out_in_the_sections_order() -> None:
     built = recording(
         profile={"duration": 60},
         source_files=[{"uuid": "0198a6f0-2222-7120-8000-000000000120"}],
+        readouts={"otu_end": 22.0, "surface_pressure": 1.012, "cns_start": 0.0},
         started_at="2026-04-17T11:49:23+02:00",
+        salinity="en13319",
         deco_model={"conservatism": 0},
         mode="open_circuit",
         device={"model": "Perdix 3"},
     )
-    assert list(built) == ["device", "mode", "deco_model", "started_at", "source_files", "profile"]
+    assert list(built) == [
+        "device",
+        "mode",
+        "deco_model",
+        "salinity",
+        "started_at",
+        "surface_pressure",
+        "cns_start",
+        "otu_end",
+        "source_files",
+        "profile",
+    ]
+
+
+# -- a readout the source states on the dive -----------------------------------------------
+
+
+def _collected() -> tuple[list[tuple[str, str, str]], Any]:
+    notes: list[tuple[str, str, str]] = []
+    return notes, lambda where, message, kind: notes.append((where, message, kind))
+
+
+def test_a_dive_level_readout_joins_the_primary_recording_in_its_place() -> None:
+    notes, note = _collected()
+    recordings = [{"device": {"model": "Perdix 3"}, "profile": {"duration": 60}}]
+    onto_primary(recordings, {"cns_end": 11.0}, note=note, where="dive/0", stated="<dive cns>")
+    assert list(recordings[0]) == ["device", "cns_end", "profile"]
+    assert notes == []
+
+
+def test_on_a_dive_with_two_recordings_it_is_the_primarys_and_says_so() -> None:
+    """The file states it once and does not say which computer computed it, so where it goes
+    is a reading of its meaning — `resolved`, which is what `docs/converting.md` asks."""
+    notes, note = _collected()
+    recordings = [{"device": {"model": "A"}}, {"device": {"model": "B"}}]
+    onto_primary(recordings, {"otu_end": 31.0}, note=note, where="dive/0", stated="<dive otu>")
+    assert recordings == [{"device": {"model": "A"}, "otu_end": 31.0}, {"device": {"model": "B"}}]
+    assert [(where, kind) for where, _, kind in notes] == [("dive/0", "resolved")]
+    assert "the dive states <dive otu> once and has 2 recordings" in notes[0][1]
+
+
+def test_on_a_dive_with_no_recording_it_is_a_recording_of_its_own() -> None:
+    notes, note = _collected()
+    recordings: list[dict[str, Any]] = []
+    onto_primary(recordings, {"cns_end": 11.0, "otu_end": 31.0}, note=note, where="dive/0", stated="x")
+    assert recordings == [{"cns_end": 11.0, "otu_end": 31.0}]
+    assert notes == []
+
+
+def test_no_readout_changes_nothing() -> None:
+    notes, note = _collected()
+    recordings: list[dict[str, Any]] = []
+    onto_primary(recordings, {}, note=note, where="dive/0", stated="x")
+    assert recordings == [] and notes == []
+
+
+# -- the millisecond axis ----------------------------------------------------------------
+
+
+@pytest.mark.parametrize(
+    ("seconds", "expected"),
+    [
+        ("0.16", 160),
+        ("1200.02", 1_200_020),
+        ("4300", 4_300_000),
+        # Halves away from zero, at the millisecond's grain (`docs/converting.md`).
+        ("0.0005", 1),
+        ("-0.0005", -1),
+        ("0.0004", 0),
+    ],
+)
+def test_a_sources_seconds_are_a_whole_millisecond_on_the_axis(seconds: str, expected: int) -> None:
+    assert milliseconds(Decimal(seconds)) == expected
+
+
+def test_no_time_is_no_place() -> None:
+    assert milliseconds(None) is None
+
+
+@pytest.mark.parametrize(
+    ("at", "said"),
+    [(0, "0"), (30_000, "30"), (30_400, "30.4"), (1_200_020, "1200.02"), (-250, "-0.25"), (4_000_000, "4000")],
+)
+def test_the_report_speaks_seconds(at: int, said: str) -> None:
+    assert in_seconds(at) == said
 
 
 def test_an_inverted_gradient_factor_pair_is_dropped_rather_than_reaching_validation() -> None:
-    """§3's rule 7, kept here rather than left to the validator.
+    """§3's rule 6, kept here rather than left to the validator.
 
     `validate_document` does check it, and a converter that let an inverted pair through
     would raise `NonConformingOutputError` and lose the whole file — every dive in it, under
@@ -316,7 +424,7 @@ def test_an_inverted_gradient_factor_pair_is_dropped_rather_than_reaching_valida
     assert _built({"algorithm": "buhlmann", "gf_low": 85, "gf_high": 50}, notes) == {
         "algorithm": "buhlmann"
     }
-    assert any("§3 rule 7" in message for message in notes)
+    assert any("§3 rule 6" in message for message in notes)
 
 
 def test_an_equal_pair_is_not_inverted() -> None:
diff --git a/tests/test_fit_fixtures.py b/tests/test_fit_fixtures.py
index 439b1b8..9ffb1c7 100644
--- a/tests/test_fit_fixtures.py
+++ b/tests/test_fit_fixtures.py
@@ -109,8 +109,8 @@ def test_the_ocean_dive_is_read_from_its_session_and_nothing_is_computed() -> No
     assert dive["avg_depth"] == 19.43
     assert dive["started_at"] == "2026-04-17T11:49:23+02:00"
     assert dive["duration"] == 4302
-    assert dive["cns_end"] == 20.0
-    assert dive["otu_end"] == 55.0
+    assert dive["recordings"][0]["cns_end"] == 20.0
+    assert dive["recordings"][0]["otu_end"] == 55.0
     assert INFERRED not in conversion.document["extensions"][PRODUCER_KEY]
     assert [note.kind for note in conversion.notes if note.kind == "inferred"] == []
 
diff --git a/tests/test_fit_parsing.py b/tests/test_fit_parsing.py
index 8ab2f8b..dd5aff2 100644
--- a/tests/test_fit_parsing.py
+++ b/tests/test_fit_parsing.py
@@ -222,14 +222,17 @@ def test_the_oxygen_accounting_comes_from_the_dive_summary_before_the_session()
         message("dive_summary", reference_mesg="session", start_cns=3, end_cns=11, o2_toxicity=23),
         session={"start_cns": 90, "end_cns": 95, "o2_toxicity": 300},
     )
-    dive = _dive(data)
-    assert (dive["cns_start"], dive["cns_end"], dive["otu_end"]) == (3.0, 11.0, 23.0)
+    recording = _dive(data)["recordings"][0]
+    assert (recording["cns_start"], recording["cns_end"], recording["otu_end"]) == (3.0, 11.0, 23.0)
 
 
 def test_the_session_supplies_the_oxygen_accounting_where_there_is_no_dive_summary() -> None:
     data = dive_file(session={"start_cns": 5, "end_cns": 20, "o2_toxicity": 55})
     dive = _dive(data)
-    assert (dive["cns_start"], dive["cns_end"], dive["otu_end"]) == (5.0, 20.0, 55.0)
+    # The computer's own figures (§6.4a), on its recording rather than on the dive.
+    recording = dive["recordings"][0]
+    assert (recording["cns_start"], recording["cns_end"], recording["otu_end"]) == (5.0, 20.0, 55.0)
+    assert not any(member in dive for member in ("cns_start", "cns_end", "otu_end"))
 
 
 def test_the_summary_describing_the_whole_activity_is_the_one_read() -> None:
@@ -362,25 +365,37 @@ def test_a_second_session_is_reported_and_not_converted() -> None:
     assert any("describes 2 sessions" in text for text in _messages(conversion, "dropped"))
 
 
-# -- water type -----------------------------------------------------------------------
+# -- salinity -------------------------------------------------------------------------
 
 
 @pytest.mark.parametrize("water", ["fresh", "salt", "en13319"])
-def test_the_devices_water_type_is_carried_under_its_own_name(water: str) -> None:
-    """`en13319` stays `en13319` rather than being folded into `salt`.
-
-    It is the calibration a computer ships set to, and rewriting it as the nearest real
-    water would be inventing a reading.
+def test_the_devices_water_type_setting_is_its_recordings_salinity(water: str) -> None:
+    """A density the computer was set to, so §6.4a's `salinity` and never the dive's
+    `water_type` — a setting of the device is not a record of the water. `en13319` stays
+    `en13319` rather than being folded into `salt`: it is the calibration a computer ships
+    set to, and rewriting it as the nearest real water would be inventing a reading.
     """
-    data = dive_file(message("dive_settings", water_type=water))
-    assert _dive(data)["water_type"] == water
+    data = dive_file(message("dive_settings", water_type=water), _at(0, depth=5.0))
+    dive = _dive(data)
+    assert dive["recordings"][0]["salinity"] == water
+    assert "water_type" not in dive
+
+
+def test_a_salinity_alone_makes_no_recording() -> None:
+    """A setting nothing recorded a dive with is not a record of one (§6.4a)."""
+    data = fit_file(
+        message("file_id", type="activity"),
+        message("dive_settings", water_type="salt"),
+        message("session", sport="diving", start_time=STARTED_AT, total_elapsed_time=60.0),
+    )
+    assert "recordings" not in _dive(data)
 
 
 def test_a_custom_water_density_is_reported_rather_than_rounded_to_the_nearest_water() -> None:
-    data = dive_file(message("dive_settings", water_type="custom", water_density=1025.0))
+    data = dive_file(message("dive_settings", water_type="custom", water_density=1025.0), _at(0, depth=5.0))
     conversion = _run(data)
-    assert "water_type" not in conversion.document["dives"][0]
-    assert any("water type is 'custom'" in text for text in _messages(conversion, "dropped"))
+    assert "salinity" not in conversion.document["dives"][0]["recordings"][0]
+    assert any("water type setting is 'custom'" in text for text in _messages(conversion, "dropped"))
 
 
 def test_a_device_that_wrote_no_dive_settings_raises_nothing() -> None:
@@ -553,7 +568,7 @@ def test_a_transmitters_pressures_become_a_profile_channel_numbered_by_its_cylin
     )
     dive = _dive(data)
     assert dive["cylinders"][0]["gas_number"] == 0
-    assert profile_of(dive)["pressures"] == [{"times": [0, 60], "values": [2100, 640], "gas_number": 0}]
+    assert profile_of(dive)["pressures"] == [{"times": [0, 60_000], "values": [2100, 640], "gas_number": 0}]
 
 
 def test_a_pods_ends_are_its_earliest_and_latest_readings_not_the_files_first_and_last() -> None:
@@ -674,7 +689,7 @@ def test_a_gas_switch_names_the_cylinder_the_logbook_shows() -> None:
         session={"total_elapsed_time": 60.0},
     )
     dive = _dive(data)
-    assert profile_of(dive)["events"] == [{"time": 60, "type": "gas_switch", "gas_number": 1}]
+    assert profile_of(dive)["events"] == [{"time": 60_000, "type": "gas_switch", "gas_number": 1}]
     assert [c["gas_number"] for c in dive["cylinders"]] == [0, 1]
 
 
@@ -689,7 +704,7 @@ def test_a_switch_to_a_gas_this_file_does_not_describe_is_still_a_switch() -> No
         session={"total_elapsed_time": 60.0},
     )
     dive = _dive(data)
-    assert profile_of(dive)["events"] == [{"time": 60, "type": "gas_switch"}]
+    assert profile_of(dive)["events"] == [{"time": 60_000, "type": "gas_switch"}]
     assert "gas_number" not in dive["cylinders"][0]
 
 
@@ -700,7 +715,7 @@ def test_a_user_marker_is_a_bookmark() -> None:
         _event(60, "user_marker"),
         session={"total_elapsed_time": 60.0},
     )
-    assert profile_of(_dive(data))["events"] == [{"time": 60, "type": "bookmark"}]
+    assert profile_of(_dive(data))["events"] == [{"time": 60_000, "type": "bookmark"}]
 
 
 def test_a_dive_alert_carries_the_devices_own_wording_and_no_type() -> None:
@@ -718,7 +733,7 @@ def test_a_dive_alert_carries_the_devices_own_wording_and_no_type() -> None:
         _event(60, "dive_alert", data=0),
         session={"total_elapsed_time": 60.0},
     )
-    assert profile_of(_dive(data))["events"] == [{"time": 60, "label": "ndl_reached"}]
+    assert profile_of(_dive(data))["events"] == [{"time": 60_000, "label": "ndl_reached"}]
 
 
 def test_an_alert_the_device_gives_no_code_for_is_dropped_rather_than_failing_the_file() -> None:
@@ -955,3 +970,13 @@ def test_a_file_that_names_no_computer_and_kept_no_sample_has_no_recording() ->
         message("session", sport="diving", start_time=STARTED_AT, total_elapsed_time=60.0),
     )
     assert "recordings" not in _dive(data)
+
+
+def test_its_oxygen_clock_alone_is_a_recording() -> None:
+    """A readout is a record of the dive nothing else produces (§6.4a), so a file that names
+    no computer and kept no sample still keeps the figures its session states."""
+    data = fit_file(
+        message("file_id", type="activity"),
+        message("session", sport="diving", start_time=STARTED_AT, total_elapsed_time=60.0, end_cns=20),
+    )
+    assert _dive(data)["recordings"] == [{"cns_end": 20.0}]
diff --git a/tests/test_fit_units.py b/tests/test_fit_units.py
index 10a73e5..8dba2ce 100644
--- a/tests/test_fit_units.py
+++ b/tests/test_fit_units.py
@@ -161,7 +161,7 @@ def test_a_ceiling_of_zero_is_not_a_ceiling() -> None:
         session={"total_elapsed_time": 60.0},
     )
     profile = profile_of(_dive(data))
-    assert profile["ceiling"] == {"times": [30], "values": [300]}
+    assert profile["ceiling"] == {"times": [30_000], "values": [300]}
     assert len(profile["depth"]["times"]) == 3
 
 
diff --git a/tests/test_series.py b/tests/test_series.py
index 0569255..2aa8557 100644
--- a/tests/test_series.py
+++ b/tests/test_series.py
@@ -80,18 +80,35 @@ def test_a_notes_path_counts_samples_in_document_order() -> None:
 def test_a_sample_before_the_dive_began_is_dropped() -> None:
     report = Reported()
     axis = _axis(report)
-    axis.offer(-1, "impossible")
+    axis.offer(-1000, "impossible")
+    axis.offer(-250, "impossible")
     assert axis.ordered() == []
-    assert report.messages == ["the record is at -1 s, before the dive began; dropped"]
+    # The report speaks the seconds a source and a diver both do, the axis's milliseconds
+    # being an encoding.
+    assert report.messages == [
+        "the record is at -1 s, before the dive began; dropped",
+        "the record is at -0.25 s, before the dive began; dropped",
+    ]
 
 
-def test_two_samples_on_one_second_keep_the_first_and_report_the_second() -> None:
+def test_two_samples_on_one_millisecond_keep_the_first_and_report_the_second() -> None:
     report = Reported()
     axis = _axis(report)
-    axis.offer(30, "kept")
-    axis.offer(30, "later")
+    axis.offer(30_000, "kept")
+    axis.offer(30_000, "later")
     assert [pair[1] for pair in axis.ordered()] == ["kept"]
-    assert "two records share the second 30" in report.messages[0]
+    assert "two records are both at 30 s, to the millisecond" in report.messages[0]
+
+
+def test_two_samples_inside_one_second_are_two_places_on_the_axis() -> None:
+    """The collision is at the millisecond (§5.1), so a fraction a source states keeps the
+    reading a whole-second axis would have dropped."""
+    report = Reported()
+    axis = _axis(report)
+    axis.offer(30_000, "first")
+    axis.offer(30_400, "second")
+    assert [pair for pair in axis.ordered()] == [(30_000, "first"), (30_400, "second")]
+    assert report.notes == []
 
 
 def test_the_order_is_worked_out_once_however_often_it_is_asked_for() -> None:
diff --git a/tests/test_ssrf_fixtures.py b/tests/test_ssrf_fixtures.py
index 6bee365..fdc8a07 100644
--- a/tests/test_ssrf_fixtures.py
+++ b/tests/test_ssrf_fixtures.py
@@ -149,8 +149,8 @@ def test_where_the_two_readings_differ_it_is_the_exporters_doing() -> None:
         "dives[]/cylinders[]/helium",
         "dives[]/weight",
         "dives[]/bottom_temperature",
-        "dives[]/cns_end",
-        "dives[]/otu_end",
+        "dives[]/recordings[]/cns_end",
+        "dives[]/recordings[]/otu_end",
         "sites[]/location/name",
         "dives[]/recordings[]/device/model",
     }
@@ -161,8 +161,9 @@ def test_where_the_two_readings_differ_it_is_the_exporters_doing() -> None:
     assert "helium" not in first_ssrf["cylinders"][0] and first_uddf["cylinders"][0]["helium"] == 0.0
     assert "weight" not in first_ssrf and first_uddf["weight"] == 0.0
     assert first_ssrf["bottom_temperature"] == 22.4 and "bottom_temperature" not in first_uddf
-    assert first_ssrf["cns_end"] == 11.0 and "cns_end" not in first_uddf
-    assert first_ssrf["otu_end"] == 31.0 and "otu_end" not in first_uddf
+    # The save file's `@cns` and `@otu` are its computer's figures (§6.4a), on that recording.
+    assert first_ssrf["recordings"][0]["cns_end"] == 11.0 and "cns_end" not in first_uddf["recordings"][0]
+    assert first_ssrf["recordings"][0]["otu_end"] == 31.0 and "otu_end" not in first_uddf["recordings"][0]
     assert "location" not in ssrf["sites"][0]
     assert uddf["sites"][0]["location"] == {"name": uddf["sites"][0]["name"]}
     assert (ssrf["dives"][0]["recordings"][0]["device"] or {}).get("model") == "Open Diving"
diff --git a/tests/test_ssrf_parsing.py b/tests/test_ssrf_parsing.py
index 81d3e89..e2cac79 100644
--- a/tests/test_ssrf_parsing.py
+++ b/tests/test_ssrf_parsing.py
@@ -36,6 +36,7 @@
     sniff,
 )
 from divejson.ssrf import SSRF_ID_NAMESPACE
+from divejson.validate import validate_document
 
 
 def dive(attributes: str = "", body: str = "", *, sites: str = "") -> dict:
@@ -160,6 +161,32 @@ def test_a_time_of_day_with_no_seconds_is_read_as_the_minute_and_reported() -> N
     assert any("records no seconds" in message for message in messages(conversion))
 
 
+def test_a_date_with_no_time_of_day_is_a_date_only_start() -> None:
+    """§5.2 lets a dive's start be the date alone, so a `@date` with no `@time` is exactly
+    that — midnight would be a time the file never stated — and the report says the time of
+    day is absent. No offset note: there is no wall clock for an offset to be missing from."""
+    conversion = convert(ssrf("<dives><dive date='2002-06-18'/></dives>"))
+    assert conversion.document["dives"][0]["started_at"] == "2002-06-18"
+    assert validate_document(conversion.document) == []
+    assert [(note.kind, note.message) for note in conversion.notes if "time of day" in note.message] == [
+        (
+            "absent",
+            (
+                "the dive records a date with no time of day; read as a date-only start rather than as "
+                "midnight (spec §5.2)"
+            ),
+        )
+    ]
+    assert not any("no UTC offset" in message for message in messages(conversion))
+
+
+@pytest.mark.parametrize("date", ["2002-02-30", "18-06-2002"])
+def test_a_date_alone_that_is_not_one_drops_the_dive(date: str) -> None:
+    conversion = convert(ssrf(f"<dives><dive date='{date}'/></dives>"))
+    assert "dives" not in conversion.document
+    assert any("the dive's date is not a date" in message for message in messages(conversion))
+
+
 def test_a_dive_with_no_date_is_dropped_because_the_format_requires_a_start_time() -> None:
     conversion = convert(ssrf("<dives><dive number='1' time='08:00:00'/></dives>"))
     assert "dives" not in conversion.document
@@ -373,7 +400,7 @@ def test_a_channel_is_not_padded_to_another_channels_length() -> None:
         "<sample time='0:20 min' depth='2.22 m'/>"
     )
     found = profile_of(convert(one_ssrf_computer(samples)).document["dives"][0])
-    assert found["depth"]["times"] == [0, 10, 20]
+    assert found["depth"]["times"] == [0, 10_000, 20_000]
     assert found["temperature"]["times"] == [0]
 
 
@@ -386,19 +413,20 @@ def test_a_sample_with_no_time_has_no_place_on_the_axis() -> None:
 
 
 def test_two_samples_on_one_second_keep_the_first() -> None:
-    """§6.5's `times` are strictly increasing, and a source's are not."""
+    """§6.5's `times` are strictly increasing, and a source's are not. `M:SS` states whole
+    seconds, so a repeated one collides at any grain."""
     conversion = convert(
         one_ssrf_computer("<sample time='0:30 min' depth='6.2 m'/><sample time='0:30 min' depth='6.4 m'/>")
     )
     assert profile_of(conversion.document["dives"][0])["depth"]["values"] == [620]
-    assert any("share the second 30" in message for message in messages(conversion))
+    assert any("two samples are both at 30 s" in message for message in messages(conversion))
 
 
 def test_samples_are_ordered_by_their_own_recorded_time() -> None:
     """Never by position: §6.5 requires increasing times and no writer guarantees its order."""
     samples = "<sample time='1:00 min' depth='9.0 m'/><sample time='0:00 min' depth='1.0 m'/>"
     found = profile_of(convert(one_ssrf_computer(samples)).document["dives"][0])
-    assert found["depth"]["times"] == [0, 60]
+    assert found["depth"]["times"] == [0, 60_000]
     assert found["depth"]["values"] == [100, 900]
 
 
@@ -423,8 +451,57 @@ def test_the_profiles_duration_is_the_span_of_its_own_samples() -> None:
     samples = "<sample time='0:00 min' depth='1.0 m'/><sample time='71:40 min' depth='0.0 m'/>"
     conversion = convert(one_ssrf_dive("duration='66:50 min'", f"<divecomputer>{samples}</divecomputer>"))
     found = conversion.document["dives"][0]
+    # The dive's own duration is seconds and the profile's axis milliseconds (§5.1).
     assert found["duration"] == 4010
-    assert profile_of(found)["duration"] == 4300
+    assert profile_of(found)["duration"] == 4_300_000
+
+
+# -- the readouts on the dive ------------------------------------------------------------
+
+
+def test_the_oxygen_clock_on_the_dive_is_its_computers() -> None:
+    """`@cns` and `@otu` sit on the `<dive>`, and a readout is a computer's own arithmetic
+    (§6.4a), so they go to the recording its computer produced."""
+    conversion = convert(one_ssrf_dive("cns='11%' otu='31'", "<divecomputer model='Ocean'/>"))
+    found = conversion.document["dives"][0]
+    assert "cns_end" not in found and "otu_end" not in found
+    assert found["recordings"] == [{"device": {"model": "Ocean"}, "cns_end": 11.0, "otu_end": 31.0}]
+    assert not any(note.kind == "resolved" for note in conversion.notes)
+
+
+def test_on_a_dive_with_two_computers_it_is_the_primarys_and_says_so() -> None:
+    """The file does not say whose figure it is, so giving it to the primary is a reading of
+    its meaning — this reader's one `resolved` finding, and not about a scale."""
+    conversion = convert(
+        one_ssrf_dive("cns='11%'", "<divecomputer model='Ocean'/><divecomputer model='Perdix'/>")
+    )
+    assert conversion.document["dives"][0]["recordings"] == [
+        {"device": {"model": "Ocean"}, "cns_end": 11.0},
+        {"device": {"model": "Perdix"}},
+    ]
+    resolved = [note for note in conversion.notes if note.kind == "resolved"]
+    assert [note.where for note in resolved] == ["dive/0"]
+    assert "the dive states <dive cns> once and has 2 recordings" in resolved[0].message
+
+
+def test_the_primary_is_the_first_recording_a_computer_yielded() -> None:
+    """A `<divecomputer>` carrying nothing a recording can hold yields none — and the one after
+    it is then the primary, which is where the figure goes."""
+    conversion = convert(
+        one_ssrf_dive(
+            "otu='31'",
+            "<divecomputer last-manual-time='44:00 min'><depth max='21.2 m'/></divecomputer>"
+            "<divecomputer model='Ocean'/>",
+        )
+    )
+    assert conversion.document["dives"][0]["recordings"] == [{"device": {"model": "Ocean"}, "otu_end": 31.0}]
+
+
+def test_a_readout_on_a_dive_no_computer_recorded_is_a_recording_of_its_own() -> None:
+    """The CNS a diver copied off their wrist into a hand-kept log is a record of the dive."""
+    document = convert(one_ssrf_dive("cns='11%'")).document
+    assert document["dives"][0]["recordings"] == [{"cns_end": 11.0}]
+    assert validate_document(document) == []
 
 
 # -- trips ----------------------------------------------------------------------------
diff --git a/tests/test_ssrf_units.py b/tests/test_ssrf_units.py
index 22f1a1b..e1b9dd0 100644
--- a/tests/test_ssrf_units.py
+++ b/tests/test_ssrf_units.py
@@ -100,6 +100,13 @@ def test_a_clock_is_minutes_and_seconds(written: str, seconds: int) -> None:
     assert one(f"duration='{written} min'").get("duration", 0) == seconds
 
 
+@pytest.mark.parametrize(("written", "milliseconds"), [("0:10", 10_000), ("1:20", 80_000), ("71:40", 4_300_000)])
+def test_a_samples_clock_is_the_same_seconds_on_a_millisecond_axis(written: str, milliseconds: int) -> None:
+    """The trap this format's three profile rows share: `@duration` beside them takes no
+    factor, and the axis takes a thousand (§5.1)."""
+    assert profile(f"<sample time='{written} min' depth='1.0 m'/>")["depth"]["times"] == [milliseconds]
+
+
 @pytest.mark.parametrize("written", ["66", "66:5", "1:60", "66:50:00", "1.5", "66m50s"])
 def test_something_that_is_not_a_clock_is_refused_rather_than_read_as_minutes(written: str) -> None:
     """A bare `66` is the tempting one, and reading it would be a factor-of-60 guess."""
@@ -138,7 +145,7 @@ def test_a_gas_is_a_percentage_and_says_so() -> None:
 
 def test_the_oxygen_clock_is_a_percentage_and_the_oxygen_dose_is_a_count() -> None:
     """`cns='11%'` and `otu='31'`: the two members whose units differ from each other."""
-    found = one("cns='11%' otu='31'")
+    found = one("cns='11%' otu='31'")["recordings"][0]
     assert found["cns_end"] == 11.0
     assert found["otu_end"] == 31.0
 
@@ -191,8 +198,10 @@ def test_the_reference_export_converts_to_the_same_channels_the_uddf_reader_prod
     """
     ssrf = profile_of(convert((FIXTURES / "ssrf" / "subsurface.ssrf").read_bytes()).document["dives"][0])
     uddf = profile_of(convert((FIXTURES / "uddf" / "subsurface.uddf").read_bytes()).document["dives"][0])
-    assert ssrf["depth"]["times"] == uddf["depth"]["times"] == [0, 10, 20, 30, 40, 80, 170, 4300]
+    assert ssrf["depth"]["times"] == uddf["depth"]["times"] == [
+        0, 10_000, 20_000, 30_000, 40_000, 80_000, 170_000, 4_300_000
+    ]
     assert ssrf["depth"]["values"] == uddf["depth"]["values"] == [145, 183, 222, 257, 260, 332, 911, 0]
-    assert ssrf["temperature"]["times"] == uddf["temperature"]["times"] == [30, 80]
+    assert ssrf["temperature"]["times"] == uddf["temperature"]["times"] == [30_000, 80_000]
     assert ssrf["temperature"]["values"] == uddf["temperature"]["values"] == [244, 240]
-    assert ssrf["duration"] == uddf["duration"] == 4300
+    assert ssrf["duration"] == uddf["duration"] == 4_300_000
diff --git a/tests/test_suunto_json_fixtures.py b/tests/test_suunto_json_fixtures.py
index 76abbd3..2cbb56d 100644
--- a/tests/test_suunto_json_fixtures.py
+++ b/tests/test_suunto_json_fixtures.py
@@ -171,27 +171,26 @@ def test_the_purged_regulator_is_not_the_dive_s_end_pressure() -> None:
 
 
 def test_the_ocean_profile_takes_each_channel_only_where_it_was_recorded() -> None:
-    """No channel is padded to another's length, and the entries at one second merge.
+    """No channel is padded to another's length, and each entry keeps its own instant.
 
-    This exporter appends its sensor streams as separate entries, so a depth and a
-    temperature recorded at the same instant arrive as two objects. They are readings of two
-    channels rather than two readings of one, so they are merged onto the second rather than
-    one of them being dropped — which is what keeps the depth channel whole.
+    This exporter appends its sensor streams as separate entries, and stamps each to the
+    millisecond: the first depth is 160 ms after the header's own instant, where a
+    whole-second axis put it at 0 beside two other entries.
     """
     profile = profile_of(_dive(OCEAN))
-    assert profile["duration"] == 4300
-    assert profile["depth"]["times"] == [0, 1200, 4000]
+    assert profile["duration"] == 4_299_990
+    assert profile["depth"]["times"] == [160, 1_200_000, 4_000_020]
     assert profile["depth"]["values"] == [145, 4464, 132]
     # One temperature and one non-zero ceiling among them, on their own axes.
-    assert profile["temperature"] == {"times": [60], "values": [224]}
-    assert profile["ceiling"] == {"times": [1200], "values": [300]}
+    assert profile["temperature"] == {"times": [60_000], "values": [224]}
+    assert profile["ceiling"] == {"times": [1_200_000], "values": [300]}
 
 
 def test_a_ceiling_of_zero_is_not_a_ceiling() -> None:
     """This shape writes `"Ceiling": 0` on every no-deco sample, twice in this file."""
     raw = json.loads(OCEAN.read_text(encoding="utf-8"))
     assert [sample.get("Ceiling") for sample in raw["DeviceLog"]["Samples"]].count(0) == 2
-    assert profile_of(_dive(OCEAN))["ceiling"]["times"] == [1200]
+    assert profile_of(_dive(OCEAN))["ceiling"]["times"] == [1_200_000]
 
 
 def test_the_ocean_events_name_the_cylinder_they_switched_to() -> None:
@@ -203,10 +202,10 @@ def test_the_ocean_events_name_the_cylinder_they_switched_to() -> None:
     """
     events = profile_of(_dive(OCEAN))["events"]
     assert events == [
-        {"time": 0, "type": "gas_switch", "gas_number": 0},
-        {"time": 1230, "type": "ceiling_violation", "label": "Ceiling Broken"},
-        {"time": 2075, "type": "gas_switch", "gas_number": 1},
-        {"time": 3840, "type": "safety_stop"},
+        {"time": 20, "type": "gas_switch", "gas_number": 0},
+        {"time": 1_230_000, "type": "ceiling_violation", "label": "Ceiling Broken"},
+        {"time": 2_075_190, "type": "gas_switch", "gas_number": 1},
+        {"time": 3_840_000, "type": "safety_stop"},
     ]
 
 
@@ -240,7 +239,7 @@ def test_the_d5_cylinders_come_from_the_header_s_own_gas_block() -> None:
             "end_pressure": 122.4375,
             "oxygen": 21.0,
             "helium": 0.0,
-            "po2_limit": 1.4,
+            "ppo2_limit": 1.4,
             "role": "bottom",
             "gas_number": 0,
         },
@@ -248,7 +247,7 @@ def test_the_d5_cylinders_come_from_the_header_s_own_gas_block() -> None:
             "volume": 11.0,
             "oxygen": 49.0,
             "helium": 0.0,
-            "po2_limit": 1.6,
+            "ppo2_limit": 1.6,
             "role": "bottom",
             "gas_number": 1,
         },
@@ -282,11 +281,11 @@ def test_the_d5_oxygen_clock_is_a_fraction_here_and_percent_in_the_document() ->
     the precision the file states, this export writing a full float32 where the same
     vendor's desktop export rounds to a whole number.
     """
-    dive = _dive(D5)
-    assert (dive["cns_start"], dive["cns_end"]) == (7.2, 15.3)
-    assert (dive["otu_start"], dive["otu_end"]) == (23.09649658203125, 45.12766647338867)
-    # 104 900 Pa, in a member §6.2 measures in bar and bounds at 0.4 to 1.2.
-    assert dive["surface_pressure"] == 1.049
+    recording = _dive(D5)["recordings"][0]
+    assert (recording["cns_start"], recording["cns_end"]) == (7.2, 15.3)
+    assert (recording["otu_start"], recording["otu_end"]) == (23.09649658203125, 45.12766647338867)
+    # 104 900 Pa, in a member §6.4a measures in bar and bounds at 0.4 to 1.2.
+    assert recording["surface_pressure"] == 1.049
 
 
 # -- the third shape, and what is not a dive ------------------------------------------
diff --git a/tests/test_suunto_json_parsing.py b/tests/test_suunto_json_parsing.py
index 747084f..d990d35 100644
--- a/tests/test_suunto_json_parsing.py
+++ b/tests/test_suunto_json_parsing.py
@@ -162,27 +162,43 @@ def test_samples_are_ordered_by_their_own_time_and_not_by_position() -> None:
             suunto_sample(30, Depth=10.0),
         ],
     )
-    assert profile_of(dive)["depth"]["times"] == [0, 30, 60]
+    assert profile_of(dive)["depth"]["times"] == [0, 30_000, 60_000]
     assert profile_of(dive)["depth"]["values"] == [100, 1000, 2000]
 
 
-def test_two_entries_on_one_second_merge_rather_than_one_being_dropped() -> None:
-    """Different channels at one instant were never in competition for that second."""
+def test_entries_inside_one_second_keep_their_own_instants() -> None:
+    """The axis is milliseconds (§5.1), so the fractions this exporter stamps are kept — and
+    what a whole-second axis made two readings compete for is two places on it."""
     dive = _dive(
         {},
         [
-            suunto_sample(0.1, Depth=1.0),
+            suunto_sample(0.16, Depth=1.0),
             suunto_sample(0.4, Temperature=293.75),
-            suunto_sample(0.2, Cylinders=suunto_slots(20_000_000)),
+            suunto_sample(0.88, Depth=8.8),
+        ],
+    )
+    profile = profile_of(dive)
+    assert profile["depth"] == {"times": [160, 880], "values": [100, 880]}
+    assert profile["temperature"]["times"] == [400]
+
+
+def test_two_entries_on_one_millisecond_merge_rather_than_one_being_dropped() -> None:
+    """Different channels at one instant were never in competition for it."""
+    dive = _dive(
+        {},
+        [
+            suunto_sample(0.1, Depth=1.0),
+            suunto_sample(0.1, Temperature=293.75),
+            suunto_sample(0.1, Cylinders=suunto_slots(20_000_000)),
         ],
     )
     profile = profile_of(dive)
-    assert profile["depth"]["times"] == [0]
-    assert profile["temperature"]["times"] == [0]
-    assert profile["pressures"][0]["times"] == [0]
+    assert profile["depth"]["times"] == [100]
+    assert profile["temperature"]["times"] == [100]
+    assert profile["pressures"][0]["times"] == [100]
 
 
-def test_one_channel_twice_on_a_second_keeps_the_first_and_is_reported_once() -> None:
+def test_one_channel_twice_on_a_millisecond_keeps_the_first_and_is_reported_once() -> None:
     """The collision that survives merging, counted per channel rather than per sample.
 
     A file whose streams overlap throughout would otherwise write one line per sample
@@ -192,15 +208,15 @@ def test_one_channel_twice_on_a_second_keeps_the_first_and_is_reported_once() ->
         {},
         [
             suunto_sample(0.1, Depth=1.0),
-            suunto_sample(0.4, Depth=9.9),
-            suunto_sample(0.2, Depth=8.8),
+            suunto_sample(0.1, Depth=9.9),
+            suunto_sample(0.1, Depth=8.8),
             suunto_sample(60, Depth=20.0),
         ],
     )
     assert profile_of(conversion.document["dives"][0])["depth"]["values"] == [100, 2000]
     assert _messages(conversion, "dropped") == [
         (
-            "2 depth readings land on a second the dive already has one at; the later reading is "
+            "2 depth readings land on a millisecond the dive already has one at; the later reading is "
             "dropped, because the format's sample times are strictly increasing (spec §6.5)"
         )
     ]
@@ -295,7 +311,7 @@ def test_a_null_pressure_is_skipped_rather_than_ending_the_series() -> None:
         ],
     )
     assert dive["cylinders"][0]["end_pressure"] == 150.0
-    assert profile_of(dive)["pressures"] == [{"times": [0, 600], "values": [2000, 1500], "gas_number": 0}]
+    assert profile_of(dive)["pressures"] == [{"times": [0, 600_000], "values": [2000, 1500], "gas_number": 0}]
 
 
 def test_readings_after_the_dive_ended_are_dropped_from_the_cylinder() -> None:
@@ -569,7 +585,7 @@ def test_a_notify_beyond_the_stops_is_typed_and_unlabelled() -> None:
     )
     assert profile_of(dive)["events"] == [
         {"time": 0, "type": "ndl_reached"},
-        {"time": 30, "type": "safety_stop_violation"},
+        {"time": 30_000, "type": "safety_stop_violation"},
     ]
 
 
@@ -762,7 +778,7 @@ def test_a_no_decompression_time_of_zero_is_a_reading() -> None:
         suunto_sample(0, Depth=44.5, NoDecTime=0, TimeToSurface=256),
         suunto_sample(10, Depth=42.6, NoDecTime=6000),
     )
-    assert found["ndl"] == {"times": [0, 10], "values": [0, 6000]}
+    assert found["ndl"] == {"times": [0, 10_000], "values": [0, 6000]}
 
 
 def test_a_time_to_surface_of_zero_is_the_absent_marker_and_is_reported() -> None:
@@ -776,7 +792,7 @@ def test_a_time_to_surface_of_zero_is_the_absent_marker_and_is_reported() -> Non
         ],
     )
     profile = profile_of(conversion.document["dives"][0])
-    assert profile["tts"] == {"times": [10], "values": [88]}
+    assert profile["tts"] == {"times": [10_000], "values": [88]}
     assert any("time to surface of zero" in message for message in _messages(conversion, "dropped"))
 
 
@@ -809,11 +825,11 @@ def test_a_negative_readout_is_dropped_by_the_channels_own_floor_and_reported()
         ],
     )
     profile = profile_of(conversion.document["dives"][0])
-    assert profile["ndl"] == {"times": [10], "values": [600]}
-    assert profile["tts"] == {"times": [10], "values": [120]}
-    assert profile["gradient_factor"] == {"times": [10], "values": [42]}
+    assert profile["ndl"] == {"times": [10_000], "values": [600]}
+    assert profile["tts"] == {"times": [10_000], "values": [120]}
+    assert profile["gradient_factor"] == {"times": [10_000], "values": [42]}
     # A zero surface gradient factor is a reading, and stays.
-    assert profile["surface_gradient_factor"] == {"times": [0, 10], "values": [0, 30]}
+    assert profile["surface_gradient_factor"] == {"times": [0, 10_000], "values": [0, 30]}
     dropped = _messages(conversion, "dropped")
     for channel in ("ndl", "tts", "gradient_factor"):
         assert any(f"{channel} readings" in message and "negative" in message for message in dropped)
diff --git a/tests/test_suunto_json_units.py b/tests/test_suunto_json_units.py
index b16eff6..37006b6 100644
--- a/tests/test_suunto_json_units.py
+++ b/tests/test_suunto_json_units.py
@@ -53,7 +53,7 @@ def test_a_pressure_is_exact_and_never_rounded() -> None:
 
 def test_a_ppo2_limit_is_pascal_too() -> None:
     """140 000 Pa is 1.4 bar, which is the number written on every deco planner."""
-    assert _dive(_gas(PO2=140_000))["cylinders"][0]["po2_limit"] == 1.4
+    assert _dive(_gas(PO2=140_000))["cylinders"][0]["ppo2_limit"] == 1.4
 
 
 def test_a_pressure_channel_is_tenths_of_a_bar() -> None:
@@ -163,14 +163,15 @@ def test_cns_is_a_fraction_and_otu_is_not() -> None:
             }
         }
     )
-    assert dive["cns_end"] == 6.9 and dive["otu_end"] == 17.89002799987793
-    # Zero is an answer for both: §6.2 gives them `minimum: 0`, so a first dive of the day
+    recording = dive["recordings"][0]
+    assert recording["cns_end"] == 6.9 and recording["otu_end"] == 17.89002799987793
+    # Zero is an answer for both: §6.4a gives them `minimum: 0`, so a first dive of the day
     # starting on nothing is a reading rather than a placeholder.
-    assert dive["cns_start"] == 0.0 and dive["otu_start"] == 0.0
+    assert recording["cns_start"] == 0.0 and recording["otu_start"] == 0.0
 
 
 def test_a_surface_pressure_is_pascal_and_the_member_is_bar() -> None:
-    assert _dive({"Diving": {"SurfacePressure": 104_900}})["surface_pressure"] == 1.049
+    assert _dive({"Diving": {"SurfacePressure": 104_900}})["recordings"][0]["surface_pressure"] == 1.049
 
 
 # -- coordinates ----------------------------------------------------------------------
@@ -229,10 +230,18 @@ def test_a_duration_is_seconds_and_rounds_half_away_from_zero() -> None:
     assert _dive({"DiveTime": 2.5})["duration"] == 3
 
 
-def test_a_sample_second_is_elapsed_time_from_the_header_s_own_start() -> None:
-    """The axis's origin, which is the instant `started_at` names."""
+def test_a_samples_place_is_elapsed_milliseconds_from_the_header_s_own_start() -> None:
+    """The axis's origin, which is the instant `started_at` names, and the fraction the
+    export stamps kept to the millisecond (§5.1)."""
     dive = _dive({}, [suunto_sample(0, Depth=1.0), suunto_sample(120.49, Depth=2.0)])
-    assert profile_of(dive)["depth"]["times"] == [0, 120]
+    assert profile_of(dive)["depth"]["times"] == [0, 120_490]
+
+
+def test_the_elapsed_time_is_exact_rather_than_a_binary_fraction() -> None:
+    """A `timedelta`'s float seconds can land a hair either side of the millisecond the
+    file states; the axis takes the microseconds as the decimal they are."""
+    dive = _dive({}, [suunto_sample(0, Depth=1.0), suunto_sample(4000.02, Depth=2.0)])
+    assert profile_of(dive)["depth"]["times"] == [0, 4_000_020]
 
 
 # -- the decompression readouts -------------------------------------------------------
diff --git a/tests/test_suunto_xml_fixtures.py b/tests/test_suunto_xml_fixtures.py
index 7459ccb..dcdb0ae 100644
--- a/tests/test_suunto_xml_fixtures.py
+++ b/tests/test_suunto_xml_fixtures.py
@@ -134,6 +134,6 @@ def test_the_two_gas_dive_ties_its_channel_and_its_markers_to_the_right_cylinder
     assert profile_of(dive)["pressures"][0]["gas_number"] == 0
     assert profile_of(dive)["events"] == [
         {"time": 0, "type": "gas_switch", "gas_number": 0},
-        {"time": 1592, "type": "gas_switch", "gas_number": 1},
+        {"time": 1_592_000, "type": "gas_switch", "gas_number": 1},
     ]
     assert profile_of(dive)["ceiling"]["times"], "the deco dive's ceiling channel"
diff --git a/tests/test_suunto_xml_parsing.py b/tests/test_suunto_xml_parsing.py
index b9f307e..d598a31 100644
--- a/tests/test_suunto_xml_parsing.py
+++ b/tests/test_suunto_xml_parsing.py
@@ -195,12 +195,12 @@ def test_a_duration_below_a_whole_second_is_read_as_not_recorded() -> None:
 def test_a_zero_depth_is_a_placeholder_and_a_zero_oxygen_clock_is_a_reading() -> None:
     """Which way a zero reads follows the member's own constraint, not this module.
 
-    §6.2 gives `max_depth` an exclusive floor and `cns_start` an inclusive one, and the
-    difference is a dive at the surface against a diver's first dive of the day.
+    §6.2 gives `max_depth` an exclusive floor and §6.4a `cns_start` an inclusive one, and
+    the difference is a dive at the surface against a diver's first dive of the day.
     """
     found = one("<MaxDepth>0</MaxDepth><CnsStart>0</CnsStart>")
     assert "max_depth" not in found
-    assert found["cns_start"] == 0.0
+    assert found["recordings"][0]["cns_start"] == 0.0
 
 
 def test_an_average_deeper_than_the_maximum_drops_the_average() -> None:
@@ -327,7 +327,7 @@ def test_a_gas_switch_names_the_cylinder_it_was_found_in() -> None:
     )
     assert profile_of(found)["events"] == [
         {"time": 0, "type": "gas_switch", "gas_number": 0},
-        {"time": 1592, "type": "gas_switch", "gas_number": 1},
+        {"time": 1_592_000, "type": "gas_switch", "gas_number": 1},
     ]
     assert [cylinder["gas_number"] for cylinder in found["cylinders"]] == [0, 1]
 
@@ -382,8 +382,8 @@ def test_each_channel_takes_only_the_samples_that_carried_a_reading_for_it() ->
             )
         )
     )
-    assert found["depth"]["times"] == [10, 20, 30]
-    assert found["pressures"][0]["times"] == [10, 30]
+    assert found["depth"]["times"] == [10_000, 20_000, 30_000]
+    assert found["pressures"][0]["times"] == [10_000, 30_000]
 
 
 def test_the_averaged_temperature_is_not_the_temperature_channel() -> None:
@@ -408,16 +408,16 @@ def test_a_sample_with_no_time_is_dropped_and_reported() -> None:
             )
         )
     )
-    assert profile_of(found.document["dives"][0])["depth"]["times"] == [20]
+    assert profile_of(found.document["dives"][0])["depth"]["times"] == [20_000]
     assert any(note.kind == "dropped" and "no <Time>" in note.message for note in found.notes)
 
 
-def test_two_samples_on_one_second_keep_the_first_and_report_the_second() -> None:
+def test_two_samples_on_one_instant_keep_the_first_and_report_the_second() -> None:
     """A real collision here, unlike the app JSON's separately appended sensor streams.
 
-    Every `<Dive.Sample>` carries every channel, so two of them on one second are two
-    readings competing for it. It fires on 37 exports in the corpus, all of them freedives
-    this reader skips before it reaches the samples.
+    Every `<Dive.Sample>` carries every channel, so two of them on one instant are two
+    readings competing for it — `fixtures/suunto_xml/freedive.xml` repeats a whole `<Time>`,
+    which collides at any grain.
     """
     found = convert(
         suunto_xml(
@@ -425,7 +425,20 @@ def test_two_samples_on_one_second_keep_the_first_and_report_the_second() -> Non
         )
     )
     assert profile_of(found.document["dives"][0])["depth"]["values"] == [186]
-    assert any(note.kind == "dropped" and "share the second 1" in note.message for note in found.notes)
+    assert any(note.kind == "dropped" and "are both at 1 s" in note.message for note in found.notes)
+
+
+def test_a_fractional_time_keeps_its_place_to_the_millisecond() -> None:
+    """`<Time>` is decimal seconds, and two samples inside one second are two readings on
+    §6.5's millisecond axis where a whole-second one had them compete."""
+    found = convert(
+        suunto_xml(
+            suunto_xml_samples(suunto_xml_sample(1, Depth="1.86"), suunto_xml_sample(1.6, Depth="2.14"))
+        )
+    )
+    depth = profile_of(found.document["dives"][0])["depth"]
+    assert depth == {"times": [1000, 1600], "values": [186, 214]}
+    assert not any("are both at" in note.message for note in found.notes)
 
 
 def test_samples_carrying_a_time_and_nothing_else_produce_no_profile() -> None:
@@ -566,7 +579,7 @@ def test_a_sample_pressure_outside_the_allowed_range_is_dropped_and_counted_once
             )
         )
     )
-    assert profile_of(found.document["dives"][0])["pressures"][0]["times"] == [30]
+    assert profile_of(found.document["dives"][0])["pressures"][0]["times"] == [30_000]
     out_of_range = [note for note in found.notes if "outside the 0 to 350" in note.message]
     assert len(out_of_range) == 1
     assert "2 samples record" in out_of_range[0].message
diff --git a/tests/test_suunto_xml_units.py b/tests/test_suunto_xml_units.py
index 9754de9..4ac3858 100644
--- a/tests/test_suunto_xml_units.py
+++ b/tests/test_suunto_xml_units.py
@@ -163,9 +163,9 @@ def test_the_surface_pressure_is_pascal_and_nothing_else_here_is(pascal: str, ba
     """The one pressure in this file that is not millibar.
 
     Read at the cylinder scale, `104900` would be 104.9 bar — a kilometre of seawater at
-    the surface — and §6.2's own 0.4 to 1.2 bound is what catches it either way.
+    the surface — and §6.4a's own 0.4 to 1.2 bound is what catches it either way.
     """
-    assert one(f"<SurfacePressure>{pascal}</SurfacePressure>")["surface_pressure"] == bar
+    assert one(f"<SurfacePressure>{pascal}</SurfacePressure>")["recordings"][0]["surface_pressure"] == bar
 
 
 def test_a_cylinder_size_is_plain_litres() -> None:
@@ -186,7 +186,7 @@ def test_the_oxygen_clock_is_whole_percent_where_the_app_json_writes_a_fraction(
     OTU needs no conversion in either format — it is the same absolute count — and this
     export rounds it where the app's writes a full float.
     """
-    found = one("<CnsStart>0</CnsStart><CnsEnd>4</CnsEnd><OtuStart>0</OtuStart><OtuEnd>10</OtuEnd>")
+    found = one("<CnsStart>0</CnsStart><CnsEnd>4</CnsEnd><OtuStart>0</OtuStart><OtuEnd>10</OtuEnd>")["recordings"][0]
     assert found["cns_start"] == 0.0
     assert found["cns_end"] == 4.0
     assert found["otu_start"] == 0.0
@@ -195,7 +195,7 @@ def test_the_oxygen_clock_is_whole_percent_where_the_app_json_writes_a_fraction(
 
 def test_a_ppo2_limit_is_already_bar() -> None:
     """`<PO2>1.4</PO2>`, where the app's JSON writes the same limit as `140000` Pascal."""
-    assert cylinder("<PO2>1.4</PO2>")["po2_limit"] == 1.4
+    assert cylinder("<PO2>1.4</PO2>")["ppo2_limit"] == 1.4
 
 
 def test_a_duration_is_already_seconds() -> None:
@@ -227,13 +227,15 @@ def test_the_same_dive_read_from_fit_and_from_this_export_agrees() -> None:
 
     assert xml["started_at"] == "2021-04-06T11:16:42.6"
     assert fit["started_at"] == "2021-04-06T11:16:42+02:00"
-    for member in ("duration", "max_depth", "avg_depth", "cns_end", "otu_end"):
+    for member in ("duration", "max_depth", "avg_depth"):
         assert xml[member] == fit[member], member
+    for member in ("cns_end", "otu_end"):
+        assert xml["recordings"][0][member] == fit["recordings"][0][member], member
     assert xml["cylinders"][0]["oxygen"] == fit["cylinders"][0]["oxygen"] == 21.0
 
     # Sample for sample on the three seconds the reduction and the whole recording share.
     shared = [0, 1, 2]
-    assert [profile_of(xml)["depth"]["times"][index] for index in shared] == [1, 11, 21]
-    assert [profile_of(fit)["depth"]["times"][index] for index in shared] == [1, 11, 21]
+    assert [profile_of(xml)["depth"]["times"][index] for index in shared] == [1000, 11_000, 21_000]
+    assert [profile_of(fit)["depth"]["times"][index] for index in shared] == [1000, 11_000, 21_000]
     assert [profile_of(xml)["depth"]["values"][index] for index in shared] == [186, 588, 756]
     assert [profile_of(fit)["depth"]["values"][index] for index in shared] == [186, 588, 756]
diff --git a/tests/test_uddf_parsing.py b/tests/test_uddf_parsing.py
index 1a8feee..1165511 100644
--- a/tests/test_uddf_parsing.py
+++ b/tests/test_uddf_parsing.py
@@ -210,15 +210,42 @@ def test_offset_spellings_are_normalized_without_being_moved(written: str, expec
     assert dive(before(datetime_text=written))["started_at"] == expected
 
 
-def test_a_truncated_midnight_is_read_as_midnight_and_reported() -> None:
-    """Subsurface emits `<datetime>2002-06-18T</datetime>` for a dive logged at midnight.
+@pytest.mark.parametrize("written", ["2002-06-18T", "2002-06-18", " 2002-06-18 "])
+def test_a_date_with_no_time_of_day_is_a_date_only_start(written: str) -> None:
+    """Subsurface emits `<datetime>2002-06-18T</datetime>` for a dive logged at midnight, and a
+    bare date is what UDDF's documentation calls a legal omission of the lower-order elements.
 
-    Dropping the dive would lose it over a writer's unguarded string concatenation, so the
-    reading is stated in the report rather than made silently.
+    Neither states a time of day, so neither is read as midnight: §5.2 lets a dive's start be
+    the date alone, and the absence of the time is reported rather than filled.
     """
-    data = one_dive(before(datetime_text="2002-06-18T"))
-    assert convert(data).document["dives"][0]["started_at"] == "2002-06-18T00:00:00"
-    assert any("no time of day" in message for message in messages(data))
+    data = one_dive(before(datetime_text=written))
+    conversion = convert(data)
+    assert conversion.document["dives"][0]["started_at"] == "2002-06-18"
+    assert validate_document(conversion.document) == []
+    found = [(note.kind, note.message) for note in conversion.notes if "2002-06-18" in note.message]
+    assert found == [
+        (
+            "absent",
+            (
+                f"{written.strip()!r} records a date with no time of day; read as a date-only start rather "
+                "than as midnight (spec §5.2)"
+            ),
+        )
+    ]
+    # No wall clock, so no offset for it to be missing.
+    assert not any("no UTC offset" in message for message in messages(data))
+
+
+def test_an_offset_beside_a_date_alone_is_dropped() -> None:
+    """A date carries no offset, and one written beside it has nowhere to go."""
+    data = one_dive(before(datetime_text="2002-06-18+02:00"))
+    assert convert(data).document["dives"][0]["started_at"] == "2002-06-18"
+    assert any("a UTC offset beside a date alone" in message for message in messages(data))
+
+
+def test_a_date_that_is_not_one_drops_the_dive() -> None:
+    conversion = convert(one_dive(before(datetime_text="2002-02-30")))
+    assert "dives" not in conversion.document
 
 
 def test_a_dive_with_no_start_time_is_dropped_rather_than_dated() -> None:
@@ -490,7 +517,8 @@ def test_hostile_source_strings_still_produce_a_conforming_document() -> None:
     assert "email" not in conversion.document["diver"]
     assert "phone" not in conversion.document["diver"]
     assert len(conversion.document["diver"]["insurances"][0]["provider"]) == 255
-    assert len(conversion.document["dives"][0]["notes"]) == 10_000
+    # A note is prose and carries whole, however long (§6.2 bounds none).
+    assert conversion.document["dives"][0]["notes"] == long_note.strip()
     assert len(conversion.document["sites"][0]["name"]) == 255
 
 
@@ -643,9 +671,9 @@ def test_channels_keep_their_own_time_axes() -> None:
         "<waypoint><depth>3.0</depth><divetime>20</divetime></waypoint>"
     )
     found = profile_of(dive(f"{STARTED_AT}<samples>{samples}</samples>"))
-    assert found["depth"]["times"] == [0, 10, 20]
+    assert found["depth"]["times"] == [0, 10_000, 20_000]
     assert found["temperature"]["times"] == [0]
-    assert found["duration"] == 20
+    assert found["duration"] == 20_000
 
 
 def test_profile_duration_spans_the_samples_rather_than_the_logged_duration() -> None:
@@ -661,7 +689,7 @@ def test_profile_duration_spans_the_samples_rather_than_the_logged_duration() ->
         "<informationafterdive><diveduration>4010</diveduration></informationafterdive>"
     )
     assert found["duration"] == 4010
-    assert profile_of(found)["duration"] == 4300
+    assert profile_of(found)["duration"] == 4_300_000
 
 
 def test_waypoints_are_ordered_by_their_recorded_time() -> None:
@@ -670,7 +698,7 @@ def test_waypoints_are_ordered_by_their_recorded_time() -> None:
         "<waypoint><depth>1.0</depth><divetime>0</divetime></waypoint>"
     )
     found = profile_of(dive(f"{STARTED_AT}<samples>{samples}</samples>"))
-    assert found["depth"]["times"] == [0, 20]
+    assert found["depth"]["times"] == [0, 20_000]
     assert found["depth"]["values"] == [100, 300]
 
 
@@ -690,17 +718,33 @@ def test_a_dropped_waypoint_is_reported_at_its_own_position_in_the_file() -> Non
     assert dropped == ["dive/0/waypoint/0", "dive/0/waypoint/2"]
 
 
-def test_waypoints_landing_on_one_second_keep_the_first() -> None:
-    """`<divetime>` is `xs:float`, and §6.5's `times` are strictly increasing integers."""
+def test_a_fractional_divetime_keeps_its_place_to_the_millisecond() -> None:
+    """`<divetime>` is `xs:float` seconds and §6.5's axis is milliseconds, so `30` and `30.4`
+    share a second and are two readings — `fixtures/uddf/legacy-writer.uddf`'s shape."""
     samples = (
         "<waypoint><depth>1.0</depth><divetime>30</divetime></waypoint>"
         "<waypoint><depth>2.0</depth><divetime>30.4</divetime></waypoint>"
+        "<waypoint><depth>3.0</depth><divetime>1200.0205</divetime></waypoint>"
     )
     data = one_dive(f"{STARTED_AT}<samples>{samples}</samples>")
     found = profile_of(convert(data).document["dives"][0])
-    assert found["depth"]["times"] == [30]
+    # Halves away from zero at the millisecond's grain.
+    assert found["depth"]["times"] == [30_000, 30_400, 1_200_021]
+    assert found["depth"]["values"] == [100, 200, 300]
+    assert not any("strictly increasing" in message for message in messages(data))
+
+
+def test_waypoints_landing_on_one_millisecond_keep_the_first() -> None:
+    """§6.5's `times` are strictly increasing integers."""
+    samples = (
+        "<waypoint><depth>1.0</depth><divetime>30.4</divetime></waypoint>"
+        "<waypoint><depth>2.0</depth><divetime>30.4002</divetime></waypoint>"
+    )
+    data = one_dive(f"{STARTED_AT}<samples>{samples}</samples>")
+    found = profile_of(convert(data).document["dives"][0])
+    assert found["depth"]["times"] == [30_400]
     assert found["depth"]["values"] == [100]
-    assert any("strictly increasing" in message for message in messages(data))
+    assert any("two waypoints are both at 30.4 s" in message for message in messages(data))
 
 
 def test_waypoints_with_no_usable_reading_produce_no_profile_and_say_so() -> None:
@@ -739,7 +783,7 @@ def test_a_dive_with_no_samples_at_all_is_not_reported() -> None:
 def test_a_waypoint_with_no_time_has_no_place_on_the_axis() -> None:
     samples = "<waypoint><depth>1.0</depth></waypoint><waypoint><depth>2.0</depth><divetime>10</divetime></waypoint>"
     data = one_dive(f"{STARTED_AT}<samples>{samples}</samples>")
-    assert profile_of(convert(data).document["dives"][0])["depth"]["times"] == [10]
+    assert profile_of(convert(data).document["dives"][0])["depth"]["times"] == [10_000]
     assert any("no place on the profile's time axis" in message for message in messages(data))
 
 
@@ -778,7 +822,7 @@ def test_a_marker_naming_an_event_type_comes_back_as_that_type() -> None:
     events = profile_of(dive(f"{STARTED_AT}<samples>{samples}</samples>"))["events"]
     assert events == [
         {"time": 0, "type": "safety_stop"},
-        {"time": 10, "label": "NoDecoTime"},
+        {"time": 10_000, "label": "NoDecoTime"},
     ]
 
 
@@ -875,6 +919,53 @@ def test_a_counter_with_no_computer_to_belong_to_is_reported() -> None:
     assert any("no device to carry it" in message for message in messages(data))
 
 
+SURFACE = "<surfacepressure>101300</surfacepressure>"
+
+
+def test_the_surface_pressure_is_the_first_links_recordings() -> None:
+    """A readout (§6.4a), stated once per dive: it goes where the samples and the counter go."""
+    computers = _equipment(_computer("c1", "<name>Ocean</name>"))
+    found = dive(before(f"{_uses('c1')}{SURFACE}"), header=computers)
+    assert "surface_pressure" not in found
+    assert found["recordings"] == [{"device": {"name": "Ocean"}, "surface_pressure": 1.013}]
+
+
+def test_a_surface_pressure_with_no_computer_is_a_recording_of_its_own() -> None:
+    """A figure a computer produced is a record of the dive (§6.4a), whether or not the file
+    says which computer — so a dive with nothing else to make a recording of still keeps it."""
+    data = one_dive(before(SURFACE))
+    assert convert(data).document["dives"][0]["recordings"] == [{"surface_pressure": 1.013}]
+    assert not any(note.kind == "resolved" for note in convert(data).notes)
+
+
+def test_on_a_dive_linking_two_computers_it_is_the_first_ones_and_says_so() -> None:
+    """The file does not say whose figure it is, so where it goes is a reading of its meaning."""
+    computers = _equipment(_computer("c1", "<name>Ocean</name>"), _computer("c2", "<name>Perdix</name>"))
+    data = one_dive(before(f"{_uses('c1', 'c2')}{SURFACE}"), header=computers)
+    conversion = convert(data)
+    assert conversion.document["dives"][0]["recordings"] == [
+        {"device": {"name": "Ocean"}, "surface_pressure": 1.013},
+        {"device": {"name": "Perdix"}},
+    ]
+    resolved = [note for note in conversion.notes if note.kind == "resolved"]
+    assert [note.where for note in resolved] == ["dive/0"]
+    assert "the dive states <surfacepressure> once and has 2 recordings" in resolved[0].message
+
+
+def test_the_surface_pressure_carries_the_first_link_past_the_carve_out() -> None:
+    """The way a profile does: the first link is a recording whether or not its element
+    names a device, and the later ones are judged on their devices alone."""
+    computers = _equipment(_computer("c1", "<notes><para>x</para></notes>"), _computer("c2", "<name>Ocean</name>"))
+    found = dive(before(f"{_uses('c1', 'c2')}{SURFACE}"), header=computers)
+    assert found["recordings"] == [{"surface_pressure": 1.013}, {"device": {"name": "Ocean"}}]
+
+
+def test_a_surface_pressure_outside_the_range_is_dropped_and_makes_nothing() -> None:
+    data = one_dive(before("<surfacepressure>10130000</surfacepressure>"))
+    assert "recordings" not in convert(data).document["dives"][0]
+    assert any("outside the 0.4 to 1.2" in message for message in messages(data))
+
+
 def test_the_dives_own_divenumber_is_the_divers_and_stays_there() -> None:
     """The two counters are different members, and this is the one the diver keeps."""
     computers = _equipment(_computer("c1", "<name>Ocean</name>"))
@@ -944,9 +1035,9 @@ def test_the_name_alone_does_not_fire_the_rule() -> None:
     "</buehlmann></decomodel>"
 )
 
-# §3's rule 4: a recording carries at least one of `device`, `profile` and `source_files`,
-# and a `mode` or a `deco_model` satisfies none of them. So every test below hangs its model
-# on a dive that kept a sample.
+# §3's rule 4: a recording carries at least one of `device`, `profile`, `source_files` and a
+# readout, and a `mode` or a `deco_model` satisfies none of them. So every test below hangs
+# its model on a dive that kept a sample.
 ONE_SAMPLE = "<samples><waypoint><depth>1</depth><divetime>0</divetime></waypoint></samples>"
 
 
@@ -963,8 +1054,8 @@ def test_a_linked_buehlmann_becomes_the_recordings_deco_model() -> None:
 
 
 def test_a_deco_model_alone_does_not_make_a_recording() -> None:
-    """§3's rule 4 names `device`, `profile` and `source_files`, and neither §6.4a member
-    this plan adds is one of them."""
+    """§3's rule 4 names `device`, `profile`, `source_files` and a readout, and neither a
+    mode nor a model is one of them."""
     assert _recording(before('<link ref="zhl16c" />'), header=BUEHLMANN) == {}
 
 
@@ -1026,7 +1117,7 @@ def test_an_inverted_gradient_factor_pair_costs_the_pair_and_not_the_file() -> N
     )
     body = before('<link ref="m" />') + ONE_SAMPLE
     assert _recording(body, header=header)["deco_model"] == {"algorithm": "buhlmann"}
-    assert any("§3 rule 7" in message for message in messages(one_dive(body, header=header)))
+    assert any("§3 rule 6" in message for message in messages(one_dive(body, header=header)))
 
 
 @pytest.mark.parametrize(
diff --git a/tests/test_uddf_units.py b/tests/test_uddf_units.py
index 681f45e..bbf7c26 100644
--- a/tests/test_uddf_units.py
+++ b/tests/test_uddf_units.py
@@ -95,7 +95,7 @@ def test_cylinder_pressures_are_plain_bar() -> None:
 def test_surface_pressure_is_plain_bar() -> None:
     """101 300 Pa / 100 000 = 1.013 bar."""
     document = convert(one_dive(before("<surfacepressure>101300</surfacepressure>"))).document
-    assert document["dives"][0]["surface_pressure"] == 1.013
+    assert document["dives"][0]["recordings"][0]["surface_pressure"] == 1.013
 
 
 @pytest.mark.parametrize(
@@ -244,7 +244,8 @@ def test_depths_and_temperatures_match_the_reference_export() -> None:
     fixture agreeing with the code that produced it.
     """
     found = profile_of(convert((FIXTURES / "uddf" / "subsurface.uddf").read_bytes()).document["dives"][0])
-    assert found["depth"]["times"] == [0, 10, 20, 30, 40, 80, 170, 4300]
+    # Milliseconds (§5.1), whole seconds times a thousand where `<divetime>` states no fraction.
+    assert found["depth"]["times"] == [0, 10_000, 20_000, 30_000, 40_000, 80_000, 170_000, 4_300_000]
     assert found["depth"]["values"] == [145, 183, 222, 257, 260, 332, 911, 0]
-    assert found["temperature"]["times"] == [30, 80]
+    assert found["temperature"]["times"] == [30_000, 80_000]
     assert found["temperature"]["values"] == [244, 240]
diff --git a/tests/test_uddf_write_fixtures.py b/tests/test_uddf_write_fixtures.py
index f8aed5a..4e63a00 100644
--- a/tests/test_uddf_write_fixtures.py
+++ b/tests/test_uddf_write_fixtures.py
@@ -40,7 +40,7 @@
 
 import pytest
 import xmlschema
-from helpers import FIXTURES, ROOT, device_of, profile_of
+from helpers import FIXTURES, ROOT, device_of, for_the_xsd, profile_of
 
 from divejson import compared, convert
 from divejson.uddf_write import compared as compared_xml
@@ -96,10 +96,13 @@
             "sites/0/location/position",
             "sites/0/location/bbox",
             "dives/0/water_type",
-            "dives/0/cns_start",
-            "dives/0/cns_end",
-            "dives/0/otu_start",
-            "dives/0/otu_end",
+            # A recording's settings and oxygen clocks have no slot, and its surface
+            # pressure has the dive's `<surfacepressure>` and so comes back.
+            "dives/0/recordings/0/salinity",
+            "dives/0/recordings/0/cns_start",
+            "dives/0/recordings/0/cns_end",
+            "dives/0/recordings/0/otu_start",
+            "dives/0/recordings/0/otu_end",
             "dives/0/entry_position",
             "dives/0/exit_position",
             "dives/0/course_uuid",
@@ -235,7 +238,7 @@ def test_the_input_document_conforms(source) -> None:
 
 @pytest.mark.parametrize("source", WRITE_FIXTURES, ids=lambda path: path.stem)
 def test_the_written_file_validates_against_the_uddf_schema(source, schema) -> None:
-    schema.validate(write_uddf(_document(source)).data.decode("utf-8"))
+    schema.validate(for_the_xsd(write_uddf(_document(source)).data.decode("utf-8")))
 
 
 @pytest.mark.parametrize("source", WRITE_FIXTURES, ids=lambda path: path.stem)
@@ -246,7 +249,7 @@ def test_the_committed_file_validates_against_the_uddf_schema(source, schema) ->
     edit that made one of them invalid is worth catching here rather than in somebody
     else's implementation.
     """
-    schema.validate(source.with_suffix(".uddf").read_text(encoding="utf-8"))
+    schema.validate(for_the_xsd(source.with_suffix(".uddf").read_text(encoding="utf-8")))
 
 
 @pytest.mark.parametrize("source", WRITE_FIXTURES, ids=lambda path: path.stem)
diff --git a/tests/test_uddf_writing.py b/tests/test_uddf_writing.py
index ff3c6b3..4a01790 100644
--- a/tests/test_uddf_writing.py
+++ b/tests/test_uddf_writing.py
@@ -21,7 +21,7 @@
 
 import pytest
 import xmlschema
-from helpers import ROOT
+from helpers import ROOT, for_the_xsd
 
 from divejson import convert
 from divejson.uddf_write import compared, write_uddf
@@ -74,7 +74,7 @@ def written(source: dict[str, Any], schema: xmlschema.XMLSchema | None = None) -
     """The document as UDDF text, validated against the schema when one is passed."""
     data = write_uddf(source).data
     if schema is not None:
-        schema.validate(data.decode("utf-8"))
+        schema.validate(for_the_xsd(data.decode("utf-8")))
     return data.decode("utf-8")
 
 
@@ -324,9 +324,9 @@ def test_a_typed_event_with_no_label_is_dropped_rather_than_written_as_the_word(
     """
     source = one_dive(
         profile={
-            "duration": 60,
-            "depth": {"times": [0, 60], "values": [0, 500]},
-            "events": [{"time": 30, "type": "ppo2_high"}],
+            "duration": 60_000,
+            "depth": {"times": [0, 60_000], "values": [0, 500]},
+            "events": [{"time": 30_000, "type": "ppo2_high"}],
         }
     )
     assert "<setmarker>" not in written(source, schema)
@@ -338,13 +338,13 @@ def test_an_event_with_a_label_and_no_type_goes_out_and_comes_back_whole(schema)
     """§6.6's spelling of an unclassified event, which is what `<setmarker>` *is*."""
     source = one_dive(
         profile={
-            "duration": 60,
-            "depth": {"times": [0, 60], "values": [0, 500]},
-            "events": [{"time": 30, "label": "Ceiling Broken"}],
+            "duration": 60_000,
+            "depth": {"times": [0, 60_000], "values": [0, 500]},
+            "events": [{"time": 30_000, "label": "Ceiling Broken"}],
         }
     )
     assert "<setmarker>Ceiling Broken</setmarker>" in written(source, schema)
-    assert recorded(read_back(source))["profile"]["events"] == [{"time": 30, "label": "Ceiling Broken"}]
+    assert recorded(read_back(source))["profile"]["events"] == [{"time": 30_000, "label": "Ceiling Broken"}]
     assert messages(source, "dives/0/recordings/0/profile/events/0") == []
 
 
@@ -358,13 +358,13 @@ def test_a_typed_event_with_a_label_keeps_the_label_and_loses_the_type(schema) -
     """
     source = one_dive(
         profile={
-            "duration": 60,
-            "depth": {"times": [0, 60], "values": [0, 500]},
-            "events": [{"time": 30, "type": "ppo2_high", "label": "PO2 High"}],
+            "duration": 60_000,
+            "depth": {"times": [0, 60_000], "values": [0, 500]},
+            "events": [{"time": 30_000, "type": "ppo2_high", "label": "PO2 High"}],
         }
     )
     assert "<setmarker>PO2 High</setmarker>" in written(source, schema)
-    assert recorded(read_back(source))["profile"]["events"] == [{"time": 30, "label": "PO2 High"}]
+    assert recorded(read_back(source))["profile"]["events"] == [{"time": 30_000, "label": "PO2 High"}]
     assert "the type is dropped" in messages(source, "dives/0/recordings/0/profile/events/0")[0]
 
 
@@ -377,9 +377,9 @@ def test_a_gas_switch_to_a_cylinder_this_dive_does_not_have_is_dropped(schema) -
     source = one_dive(
         cylinders=[{"start_pressure": 200.0, "oxygen": 21.0, "gas_number": 0}],
         profile={
-            "duration": 60,
-            "depth": {"times": [0, 60], "values": [0, 500]},
-            "events": [{"time": 30, "type": "gas_switch", "gas_number": 7}],
+            "duration": 60_000,
+            "depth": {"times": [0, 60_000], "values": [0, 500]},
+            "events": [{"time": 30_000, "type": "gas_switch", "gas_number": 7}],
         },
     )
     assert "<switchmix" not in written(source, schema)
@@ -404,11 +404,11 @@ def test_two_cylinders_on_one_blend_get_a_mix_each(schema) -> None:
             {"start_pressure": 218.0, "oxygen": 18.0, "helium": 45.0, "gas_number": 1},
         ],
         profile={
-            "duration": 600,
-            "depth": {"times": [0, 600], "values": [0, 3000]},
+            "duration": 600_000,
+            "depth": {"times": [0, 600_000], "values": [0, 3000]},
             "pressures": [
                 {"times": [0], "values": [2200], "gas_number": 0},
-                {"times": [600], "values": [2000], "gas_number": 1},
+                {"times": [600_000], "values": [2000], "gas_number": 1},
             ],
         },
     )
@@ -418,7 +418,7 @@ def test_two_cylinders_on_one_blend_get_a_mix_each(schema) -> None:
     channels = recorded(read_back(source))["profile"]["pressures"]
     assert channels == [
         {"times": [0], "values": [2200], "gas_number": 0},
-        {"times": [600], "values": [2000], "gas_number": 1},
+        {"times": [600_000], "values": [2000], "gas_number": 1},
     ]
 
 
@@ -451,9 +451,9 @@ def test_a_cylinder_whose_gas_nobody_recorded_still_gets_a_mix(schema) -> None:
     source = one_dive(
         cylinders=[{"start_pressure": 200.0, "gas_number": 0}],
         profile={
-            "duration": 60,
-            "depth": {"times": [0, 60], "values": [0, 500]},
-            "pressures": [{"times": [0, 60], "values": [2000, 1500], "gas_number": 0}],
+            "duration": 60_000,
+            "depth": {"times": [0, 60_000], "values": [0, 500]},
+            "pressures": [{"times": [0, 60_000], "values": [2000, 1500], "gas_number": 0}],
         },
     )
     text = written(source, schema)
@@ -473,8 +473,8 @@ def test_a_gas_number_that_is_a_label_comes_back_as_a_position() -> None:
             {"start_pressure": 190.0, "oxygen": 50.0, "gas_number": 5},
         ],
         profile={
-            "duration": 60,
-            "depth": {"times": [0, 60], "values": [0, 500]},
+            "duration": 60_000,
+            "depth": {"times": [0, 60_000], "values": [0, 500]},
             "pressures": [{"times": [0], "values": [2000], "gas_number": 3}],
         },
     )
@@ -508,8 +508,8 @@ def test_a_numbering_that_survives_is_not_reported() -> None:
             {"start_pressure": 190.0, "oxygen": 50.0, "gas_number": 1},
         ],
         profile={
-            "duration": 60,
-            "depth": {"times": [0, 60], "values": [0, 500]},
+            "duration": 60_000,
+            "depth": {"times": [0, 60_000], "values": [0, 500]},
             "pressures": [{"times": [0], "values": [2000], "gas_number": 1}],
         },
     )
@@ -522,7 +522,7 @@ def test_a_numbering_that_survives_is_not_reported() -> None:
 
 def _with_readouts(**channels: Any) -> dict[str, Any]:
     """The smallest profile that carries a channel, on two depth samples."""
-    return {"duration": 60, "depth": {"times": [0, 60], "values": [0, 500]}, **channels}
+    return {"duration": 60_000, "depth": {"times": [0, 60_000], "values": [0, 500]}, **channels}
 
 
 @pytest.mark.parametrize(
@@ -644,25 +644,41 @@ def test_a_reading_between_two_depth_samples_gets_its_own_waypoint(schema) -> No
     """
     source = one_dive(
         profile={
-            "duration": 60,
-            "depth": {"times": [0, 60], "values": [0, 500]},
-            "temperature": {"times": [30], "values": [245]},
+            "duration": 60_000,
+            "depth": {"times": [0, 60_000], "values": [0, 500]},
+            "temperature": {"times": [30_000], "values": [245]},
         }
     )
     text = written(source, schema)
     assert text.count("<waypoint>") == 3
 
     profile = recorded(read_back(source))["profile"]
-    assert profile["temperature"] == {"times": [30], "values": [245]}
-    assert profile["depth"] == {"times": [0, 60], "values": [0, 500]}
+    assert profile["temperature"] == {"times": [30_000], "values": [245]}
+    assert profile["depth"] == {"times": [0, 60_000], "values": [0, 500]}
+
+
+def test_a_millisecond_that_is_not_a_whole_second_goes_out_as_a_fraction(schema) -> None:
+    """`<divetime>` is `xs:float` seconds and the axis milliseconds, so a time is divided by a
+    thousand in decimal: a whole second is the integer it is, and `1200.02` comes back as
+    exactly `1200020` — the self round trip is exact."""
+    source = one_dive(
+        profile={"duration": 1_200_020, "depth": {"times": [160, 60_000, 1_200_020], "values": [145, 500, 132]}}
+    )
+    text = written(source, schema)
+    assert "<divetime>0.16</divetime>" in text
+    assert "<divetime>60</divetime>" in text
+    assert "<divetime>1200.02</divetime>" in text
+    assert recorded(read_back(source))["profile"] == source["dives"][0]["recordings"][0]["profile"]
 
 
 def test_a_profile_duration_longer_than_its_samples_is_reported() -> None:
     """§6.4 defines the member as the span of the samples, and UDDF records no such member
     at all — so a reader recomputes it and a document claiming more comes back with less."""
-    source = one_dive(profile={"duration": 900, "depth": {"times": [0, 60], "values": [0, 500]}})
-    assert recorded(read_back(source))["profile"]["duration"] == 60
-    assert "its samples span 60 s" in messages(source, "dives/0/recordings/0/profile")[0]
+    source = one_dive(profile={"duration": 900_000, "depth": {"times": [0, 60_000], "values": [0, 500]}})
+    assert recorded(read_back(source))["profile"]["duration"] == 60_000
+    assert "the profile's duration is 900 s where its samples span 60 s" in messages(
+        source, "dives/0/recordings/0/profile"
+    )[0]
 
 
 def test_two_events_on_one_second_keep_the_first(schema) -> None:
@@ -670,16 +686,16 @@ def test_two_events_on_one_second_keep_the_first(schema) -> None:
     markers with a separator, which comes back as one event labelled with two labels."""
     source = one_dive(
         profile={
-            "duration": 60,
-            "depth": {"times": [0, 60], "values": [0, 500]},
+            "duration": 60_000,
+            "depth": {"times": [0, 60_000], "values": [0, 500]},
             "events": [
-                {"time": 30, "label": "first"},
-                {"time": 30, "label": "second"},
+                {"time": 30_000, "label": "first"},
+                {"time": 30_000, "label": "second"},
             ],
         }
     )
     written(source, schema)
-    assert recorded(read_back(source))["profile"]["events"] == [{"time": 30, "label": "first"}]
+    assert recorded(read_back(source))["profile"]["events"] == [{"time": 30_000, "label": "first"}]
     assert "the later event is dropped" in messages(source, "dives/0/recordings/0/profile/events/1")[0]
 
 
@@ -688,13 +704,13 @@ def test_a_marker_event_keeps_its_type_and_loses_its_label(schema) -> None:
     go on, so a labelled safety stop keeps the half a reader can recognise."""
     source = one_dive(
         profile={
-            "duration": 60,
-            "depth": {"times": [0, 60], "values": [0, 500]},
-            "events": [{"time": 30, "type": "safety_stop", "label": "at the line"}],
+            "duration": 60_000,
+            "depth": {"times": [0, 60_000], "values": [0, 500]},
+            "events": [{"time": 30_000, "type": "safety_stop", "label": "at the line"}],
         }
     )
     assert "<setmarker>safety_stop</setmarker>" in written(source, schema)
-    assert recorded(read_back(source))["profile"]["events"] == [{"time": 30, "type": "safety_stop"}]
+    assert recorded(read_back(source))["profile"]["events"] == [{"time": 30_000, "type": "safety_stop"}]
     assert "the label is dropped" in messages(source, "dives/0/recordings/0/profile/events/0")[0]
 
 
@@ -1174,8 +1190,8 @@ def test_a_second_recording_is_dropped_with_its_device_kept(schema) -> None:
     sampled cannot be."""
     source = one_dive(
         recordings=[
-            {"device": {"name": "Ocean"}, "profile": {"duration": 60, "depth": {"times": [0], "values": [500]}}},
-            {"device": {"name": "Perdix"}, "profile": {"duration": 60, "depth": {"times": [0], "values": [510]}}},
+            {"device": {"name": "Ocean"}, "profile": {"duration": 60_000, "depth": {"times": [0], "values": [500]}}},
+            {"device": {"name": "Perdix"}, "profile": {"duration": 60_000, "depth": {"times": [0], "values": [510]}}},
         ]
     )
     text = written(source, schema)
@@ -1187,6 +1203,57 @@ def test_a_second_recording_is_dropped_with_its_device_kept(schema) -> None:
     )
 
 
+def test_the_primary_recordings_surface_pressure_is_the_dives(schema) -> None:
+    """UDDF states one `<surfacepressure>` per dive, and the reader gives it back to the first
+    recording — so it is written from there, and a later recording's goes with that
+    recording, which is reported dropped whole."""
+    source = one_dive(
+        recordings=[
+            {"device": {"name": "Ocean"}, "surface_pressure": 1.013},
+            {"device": {"name": "Perdix"}, "surface_pressure": 1.009},
+        ]
+    )
+    text = written(source, schema)
+    assert text.count("<surfacepressure>") == 1 and "<surfacepressure>101300</surfacepressure>" in text
+    assert recorded(read_back(source))["surface_pressure"] == 1.013
+    assert not any("surface_pressure" in message for message in messages(source, "dives/0/recordings/0"))
+    assert any("UDDF holds one profile per dive" in message for message in messages(source, "dives/0/recordings/1"))
+
+
+def test_a_recordings_salinity_and_oxygen_clocks_have_no_slot(schema) -> None:
+    """UDDF's per-waypoint `<cns>` is a channel and not the clock's two ends, and its one
+    density sits on a recalculated profile — so neither is a home for these, and each is
+    reported from the record rather than dropped quietly."""
+    readouts = {"salinity": "en13319", "cns_start": 4.5, "cns_end": 61.0, "otu_start": 0, "otu_end": 88.5}
+    source = one_dive(recordings=[{"device": {"name": "Ocean"}, **readouts}])
+    text = written(source, schema)
+    assert "en13319" not in text and "<cns>" not in text
+    back = recorded(read_back(source))
+    assert not any(member in back for member in readouts)
+    reported = " ".join(messages(source, "dives/0/recordings/0"))
+    for member in readouts:
+        assert member in reported, member
+
+
+def test_a_date_only_start_goes_out_as_the_bare_date_and_comes_back_one(schema) -> None:
+    """`<datetime>2002-06-18</datetime>` is UDDF's documented spelling for an omitted time of
+    day, though its XSD types the element `xs:dateTime` — so the schema pass here widens the
+    spelling for itself alone (`helpers.for_the_xsd`). Midnight would be a time the document
+    never had, and nothing is lost, so nothing is reported."""
+    source = one_dive(started_at="2002-06-18")
+    text = written(source, schema)
+    assert "<datetime>2002-06-18</datetime>" in text
+    assert read_back(source)["dives"][0]["started_at"] == "2002-06-18"
+    assert not any("started_at" in message or "datetime" in message for _, _, message in notes(source))
+
+
+def test_the_xsd_refuses_the_bare_date_the_pass_widens(schema) -> None:
+    """What the widening is for, pinned: without it the file fails `xs:dateTime`, which is
+    the disagreement `docs/uddf-writing.md` records rather than a defect in the writer."""
+    with pytest.raises(xmlschema.XMLSchemaValidationError):
+        schema.validate(write_uddf(one_dive(started_at="2002-06-18")).data.decode("utf-8"))
+
+
 def test_a_recordings_own_start_and_files_have_no_slot(schema) -> None:
     """`<datetime>` stays the dive's: §6.2's `started_at` is the logbook's, and that is
     what every reader of a UDDF file expects to find there."""
@@ -1243,7 +1310,7 @@ def test_a_kit_computer_linked_ahead_of_the_recordings_own_is_reported(schema) -
                 "recordings": [
                     {
                         "device": {"name": "Ocean", "brand": "Suunto", "serial": "S1", "dive_number": 118},
-                        "profile": {"duration": 60, "depth": {"times": [0, 60], "values": [0, 500]}},
+                        "profile": {"duration": 60_000, "depth": {"times": [0, 60_000], "values": [0, 500]}},
                     }
                 ],
             }
@@ -1355,7 +1422,7 @@ def test_a_kit_computer_no_recording_answers_to_is_a_gain_and_is_silent(schema)
                 "recordings": [
                     {
                         "device": {"name": "Ocean"},
-                        "profile": {"duration": 60, "depth": {"times": [0, 60], "values": [0, 500]}},
+                        "profile": {"duration": 60_000, "depth": {"times": [0, 60_000], "values": [0, 500]}},
                     }
                 ],
             }
diff --git a/tests/test_validate.py b/tests/test_validate.py
index d77db6e..d1c0cca 100644
--- a/tests/test_validate.py
+++ b/tests/test_validate.py
@@ -9,9 +9,11 @@
 that it does.
 
 So these, and deliberately nothing else: the channels §6.4 added, the gradient-factor
-ordering §3 rule 7 states, and the one uuid claim whose fixture is refused for another
-reason by any validator that does not know its member. Everything already covered by a pair
-stays covered by the pair.
+ordering §3 rule 6 states, what §3 rule 4 accepts as a recording's content, the one member
+that may hold a date as well as a date-time, the member order the validator no longer
+checks — no `invalid/` document can pin an absence of a rule — and the one uuid claim whose
+fixture is refused for another reason by any validator that does not know its member.
+Everything already covered by a pair stays covered by the pair.
 """
 
 from __future__ import annotations
@@ -21,7 +23,7 @@
 import pytest
 from helpers import FIXTURES
 
-from divejson.validate import CHANNELS, validate_document
+from divejson.validate import CHANNELS, READOUTS, validate_document
 
 
 def document(recording: dict) -> dict:
@@ -77,7 +79,7 @@ def test_the_validators_channel_list_is_the_schemas() -> None:
 
 
 def test_a_gradient_factor_low_above_the_high_is_rejected() -> None:
-    """§3 rule 7, and UDDF's own constraint on the same pair. The schema makes them
+    """§3 rule 6, and UDDF's own constraint on the same pair. The schema makes them
     both-or-neither and puts each on 0-100; neither of those can say one is not above the
     other, and a low above a high is a decompression model nothing ran."""
     found = issues({"deco_model": {"gf_low": 85, "gf_high": 30}, "device": {"model": "Perdix 3"}})
@@ -108,3 +110,70 @@ def test_a_portrait_shares_the_documents_one_identifier_space() -> None:
     assert [str(issue) for issue in validate_document(doc)] == [
         "certifications/0/front_file: uuid 0198a6f0-1111-7081-8000-000000000081 already used at diver/portrait_file"
     ]
+
+
+# -- §3 rule 4: what a recording carries -------------------------------------------------
+
+
+@pytest.mark.parametrize("readout", READOUTS)
+def test_a_readout_alone_is_a_recording(readout) -> None:
+    """A figure the device computed is a record of the dive nothing else produces (§6.4a) —
+    the CNS a diver copied off their computer into a hand-kept log."""
+    value = 1.0 if readout == "surface_pressure" else 0
+    assert issues({readout: value}) == []
+
+
+def test_a_setting_alone_is_not() -> None:
+    """`mode`, `deco_model` and `salinity` describe how a computer was set, and a setting
+    nothing recorded a dive with is not a record of one."""
+    assert issues({"mode": "gauge", "salinity": "en13319", "deco_model": {"conservatism": 0}}) == [
+        (
+            "dives/0/recordings/0: a recording carries at least one of device, profile, source_files and a "
+            "readout — surface_pressure, cns_start, cns_end, otu_start, otu_end (spec §3, §6.4a)"
+        )
+    ]
+
+
+def test_the_readout_list_is_the_recordings_own() -> None:
+    """Every readout is a member of the recording and of nothing else a dive carries, so the
+    list and the schema cannot drift apart silently in either direction."""
+    from divejson.validate import load_schema
+
+    defs = load_schema()["$defs"]
+    assert set(READOUTS) <= set(defs["recording"]["properties"])
+    assert not set(READOUTS) & set(defs["dive"]["properties"])
+
+
+# -- a dive's start may be its date --------------------------------------------------------
+
+
+def _with_start(started_at: str) -> list[str]:
+    doc = document({"device": {"model": "Perdix 3"}})
+    doc["dives"][0]["started_at"] = started_at
+    return [str(issue) for issue in validate_document(doc)]
+
+
+def test_a_dive_may_start_on_a_date_alone() -> None:
+    assert _with_start("2026-07-05") == []
+
+
+def test_a_date_that_is_not_one_is_refused() -> None:
+    assert "dives/0/started_at: '2026-02-30' is not a real calendar date" in _with_start("2026-02-30")
+
+
+def test_a_recordings_own_start_takes_a_date_time_and_nothing_else() -> None:
+    """§5.2: no other date-time member takes a date — a recording that knows its own start
+    knows its instant."""
+    found = issues({"device": {"model": "Perdix 3"}, "started_at": "2026-07-05"})
+    assert "dives/0/recordings/0/started_at: '2026-07-05' is not a DiveJSON date-time" in found
+
+
+# -- §4's member order is a SHOULD -------------------------------------------------------------
+
+
+def test_a_document_in_any_member_order_conforms() -> None:
+    """A generic re-serialisation — Go's `encoding/json` sorting a map's keys — writes
+    `exported_at` before `format`, and the document it wrote is as conforming as the one it
+    read (§4)."""
+    doc = document({"device": {"model": "Perdix 3"}})
+    assert validate_document(dict(sorted(doc.items()))) == []

From 6b459932c719a2342b91a25fbd66a9cfd0bf03cf Mon Sep 17 00:00:00 2001
From: Aleksei Vesnin <aleksei@vesnin.me>
Date: Thu, 24 Sep 2026 22:55:07 +0300
Subject: [PATCH 3/9] Say milliseconds and readouts where the contributor guide
 and two test modules still said otherwise

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 CONTRIBUTING.md                   |  8 ++++++--
 tests/test_suunto_json_parsing.py |  7 ++++---
 tests/test_uddf_write_fixtures.py | 12 ++++++++++--
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6c4698c..41a9bcd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -73,8 +73,12 @@ this arrangement exists to prevent:
 - **Parse XML through `xmlsource.parse_xml`**, which refuses a `<!DOCTYPE>` before expat
   expands anything (spec §9).
 - **Build a profile through `series.SampleAxis`**, which owns the ordering, the sample with
-  no time, the two samples on one second, and the dive whose samples carry nothing this
-  format can hold. `noun` and `time_member` keep the report speaking the source's language.
+  no time, the two samples on one millisecond, and the dive whose samples carry nothing this
+  format can hold. Offer it `converter.milliseconds` of the seconds the source states, which
+  keeps a fraction the source wrote. `noun` and `time_member` keep the report speaking the
+  source's language.
+- **Put a device's readouts on its recording.** A figure the source states once for the
+  whole dive goes through `converter.onto_primary`, which is `docs/converting.md`'s rule.
 - **Ask `converter.recorded` which way a zero reads.** The member's own schema constraint
   decides, and the answer differs between members that look alike.
 - **Validate the document before returning it, unless `scope.validates_alone` is false.**
diff --git a/tests/test_suunto_json_parsing.py b/tests/test_suunto_json_parsing.py
index d990d35..b32962b 100644
--- a/tests/test_suunto_json_parsing.py
+++ b/tests/test_suunto_json_parsing.py
@@ -702,15 +702,16 @@ def _recording(header: dict, samples: list[dict] | None = None) -> dict:
     """The dive's one recording, on a file that kept a sample.
 
     The sample is not decoration: §3's rule 4 says a recording carries at least one of
-    `device`, `profile` and `source_files`, and neither §6.4a member this plan adds is one of
-    them — so a header stating a mode and nothing else produces no recording to put it in.
+    `device`, `profile`, `source_files` and a readout, and neither a mode nor a model is one
+    of them — so a header stating a mode and nothing else produces no recording to put it in.
     """
     recordings = _dive(header, samples or [suunto_sample(0, Depth=20.0)]).get("recordings") or []
     return recordings[0] if recordings else {}
 
 
 def test_a_mode_and_a_model_alone_do_not_make_a_recording() -> None:
-    """§3's rule 4 names `device`, `profile` and `source_files`, and these are neither."""
+    """§3's rule 4 names `device`, `profile`, `source_files` and a readout, and these are
+    none of them."""
     assert "recordings" not in _dive({"Diving": {"DiveMode": "Air", "Conservatism": 0}})
 
 
diff --git a/tests/test_uddf_write_fixtures.py b/tests/test_uddf_write_fixtures.py
index 4e63a00..e753dd8 100644
--- a/tests/test_uddf_write_fixtures.py
+++ b/tests/test_uddf_write_fixtures.py
@@ -29,7 +29,7 @@
 by both, compared after reading rather than as two files, because the writers are allowed to
 differ and the logbook is not. Profile channels are compared by count and extremes there,
 the reference writer snapping its other channels onto the depth axis where this one leaves
-every reading on its own second.
+every reading on its own instant.
 """
 
 from __future__ import annotations
@@ -318,7 +318,6 @@ def test_the_report_names_everything_that_changed(source) -> None:
     "visibility",
     "weight",
     "altitude",
-    "surface_pressure",
     "trip_uuid",
     "site_uuids",
     "gear_uuids",
@@ -365,6 +364,15 @@ def test_the_two_writers_agree_on_every_dive_level_scalar(both) -> None:
     ]
 
 
+def test_the_two_writers_agree_on_the_surface_pressure(both) -> None:
+    """UDDF's one dive-level readout, which both files state and the reader gives to the
+    primary recording (§6.4a)."""
+    reference, ours = both
+    assert [(dive.get("recordings") or [{}])[0].get("surface_pressure") for dive in ours["dives"]] == [
+        (dive.get("recordings") or [{}])[0].get("surface_pressure") for dive in reference["dives"]
+    ]
+
+
 def test_the_two_writers_agree_on_the_device_each_recording_names(both) -> None:
     """The fold, seen from the reading side: one computer, one element, one device.
 

From 4027244656b0525e422601245c3c27a59edbe640 Mon Sep 17 00:00:00 2001
From: Aleksei Vesnin <aleksei@vesnin.me>
Date: Thu, 24 Sep 2026 22:55:38 +0300
Subject: [PATCH 4/9] Word the readout rule as the rule rather than as one
 helper

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 CONTRIBUTING.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 41a9bcd..2793953 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -78,7 +78,8 @@ this arrangement exists to prevent:
   keeps a fraction the source wrote. `noun` and `time_member` keep the report speaking the
   source's language.
 - **Put a device's readouts on its recording.** A figure the source states once for the
-  whole dive goes through `converter.onto_primary`, which is `docs/converting.md`'s rule.
+  whole dive goes to the primary recording, reported where the dive has more than one —
+  `docs/converting.md`'s rule, which `converter.onto_primary` implements.
 - **Ask `converter.recorded` which way a zero reads.** The member's own schema constraint
   decides, and the answer differs between members that look alike.
 - **Validate the document before returning it, unless `scope.validates_alone` is false.**

From 4378d4dc8ed61e6f169e42a605e0b16a4a3e5eb5 Mon Sep 17 00:00:00 2001
From: Aleksei Vesnin <aleksei@vesnin.me>
Date: Thu, 24 Sep 2026 23:08:35 +0300
Subject: [PATCH 5/9] =?UTF-8?q?Describe=20the=20millisecond=20axis=20as=20?=
 =?UTF-8?q?it=20is,=20and=20rename=20the=20header=20test=20to=20=C2=A74's?=
 =?UTF-8?q?=20SHOULD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 divejson/suunto_json.py            | 11 ++++-------
 divejson/suunto_xml.py             |  9 +++------
 tests/test_converter.py            |  2 +-
 tests/test_series.py               |  4 ++--
 tests/test_suunto_json_fixtures.py |  3 +--
 tests/test_suunto_json_parsing.py  |  4 ++--
 tests/test_suunto_xml_parsing.py   |  2 +-
 7 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/divejson/suunto_json.py b/divejson/suunto_json.py
index 6e89274..3ebff7a 100644
--- a/divejson/suunto_json.py
+++ b/divejson/suunto_json.py
@@ -1163,13 +1163,10 @@ def axis(self, origin: datetime, where: str) -> SampleAxis:
         **Entries that land on one millisecond are merged rather than one of them being
         dropped.** This exporter appends its sensor streams as separate entries: on the file
         this reader is measured against, 7 477 entries carry a depth, a temperature, a
-        satellite fix or a battery reading, almost never two of those at once. On a
-        whole-second axis they collided, and offering them one at a time kept 345 of the
-        dive's 431 depths where merging kept all 431 — the count the same dive's FIT reading
-        gives. The millisecond places each at its own instant, and merging is what still
-        decides two entries of different channels stamped the same one: each of §6.5's
-        channels carries its own times, and two different channels at one instant were never
-        in competition.
+        satellite fix or a battery reading, almost never two of those at once. Each of §6.5's
+        channels carries its own times, so two entries of different channels stamped the same
+        millisecond were never in competition, and merging them keeps every depth the dive
+        recorded — 431, the count the same dive's FIT reading gives.
 
         What is still a collision is one **channel** twice on a millisecond, and that is
         reported per channel rather than per sample: a file whose streams overlap throughout
diff --git a/divejson/suunto_xml.py b/divejson/suunto_xml.py
index 01fc117..e926cd3 100644
--- a/divejson/suunto_xml.py
+++ b/divejson/suunto_xml.py
@@ -866,12 +866,9 @@ def read_profile(self, cylinders: list[_Cylinder], where: str) -> dict[str, Any]
         unaffected — so the channels sit on their own axes and none is padded to another's
         length. Two samples on one instant are therefore a real collision here rather than
         two sensor streams that were never in competition, and the axis settles them per
-        channel. On a whole-second axis it fired on 37 of the corpus's exports, every one of
-        them a freedive, where a 1 s sampling interval meets a `<Time>` that is not quite an
-        integer; `<Time>`'s decimal seconds reach the millisecond axis whole, so what still
-        collides is a `<Time>` the file repeats. Those 37 were unreachable while the reader
-        stopped at `<Mode>3</Mode>` before it read a sample, so carrying freedives is what
-        first made this rule fire on a real file.
+        channel. `<Time>`'s decimal seconds reach the millisecond axis whole, so what collides
+        is a `<Time>` the file repeats — `fixtures/suunto_xml/freedive.xml` writes `1` three
+        times.
 
         `<AveragedTemperature>` is deliberately not the temperature channel: it is a
         smoothed reading sitting beside the raw `<Temperature>` in the same element, and
diff --git a/tests/test_converter.py b/tests/test_converter.py
index 01316ce..2dd1bdf 100644
--- a/tests/test_converter.py
+++ b/tests/test_converter.py
@@ -146,7 +146,7 @@ def test_members_of_one_archive_share_what_has_been_claimed() -> None:
 # -- the document header --------------------------------------------------------------
 
 
-def test_the_header_opens_with_the_two_members_section_4_requires_first() -> None:
+def test_the_header_opens_with_the_two_members_section_4_asks_for_first() -> None:
     written = header(datetime(2026, 9, 5, tzinfo=timezone.utc))
     assert list(written)[:2] == ["format", "version"]
     assert written["exported_at"] == "2026-09-05T00:00:00+00:00"
diff --git a/tests/test_series.py b/tests/test_series.py
index 2aa8557..c5a0447 100644
--- a/tests/test_series.py
+++ b/tests/test_series.py
@@ -101,8 +101,8 @@ def test_two_samples_on_one_millisecond_keep_the_first_and_report_the_second() -
 
 
 def test_two_samples_inside_one_second_are_two_places_on_the_axis() -> None:
-    """The collision is at the millisecond (§5.1), so a fraction a source states keeps the
-    reading a whole-second axis would have dropped."""
+    """The collision is at the millisecond (§5.1), so two readings a source stamps inside
+    one second are two places on the axis."""
     report = Reported()
     axis = _axis(report)
     axis.offer(30_000, "first")
diff --git a/tests/test_suunto_json_fixtures.py b/tests/test_suunto_json_fixtures.py
index 2cbb56d..3f32328 100644
--- a/tests/test_suunto_json_fixtures.py
+++ b/tests/test_suunto_json_fixtures.py
@@ -174,8 +174,7 @@ def test_the_ocean_profile_takes_each_channel_only_where_it_was_recorded() -> No
     """No channel is padded to another's length, and each entry keeps its own instant.
 
     This exporter appends its sensor streams as separate entries, and stamps each to the
-    millisecond: the first depth is 160 ms after the header's own instant, where a
-    whole-second axis put it at 0 beside two other entries.
+    millisecond: the first depth is 160 ms after the header's own instant, and sits there.
     """
     profile = profile_of(_dive(OCEAN))
     assert profile["duration"] == 4_299_990
diff --git a/tests/test_suunto_json_parsing.py b/tests/test_suunto_json_parsing.py
index b32962b..bc620d4 100644
--- a/tests/test_suunto_json_parsing.py
+++ b/tests/test_suunto_json_parsing.py
@@ -167,8 +167,8 @@ def test_samples_are_ordered_by_their_own_time_and_not_by_position() -> None:
 
 
 def test_entries_inside_one_second_keep_their_own_instants() -> None:
-    """The axis is milliseconds (§5.1), so the fractions this exporter stamps are kept — and
-    what a whole-second axis made two readings compete for is two places on it."""
+    """The axis is milliseconds (§5.1), so each fraction this exporter stamps is a place of
+    its own on it, however many share one second."""
     dive = _dive(
         {},
         [
diff --git a/tests/test_suunto_xml_parsing.py b/tests/test_suunto_xml_parsing.py
index d598a31..9a04275 100644
--- a/tests/test_suunto_xml_parsing.py
+++ b/tests/test_suunto_xml_parsing.py
@@ -430,7 +430,7 @@ def test_two_samples_on_one_instant_keep_the_first_and_report_the_second() -> No
 
 def test_a_fractional_time_keeps_its_place_to_the_millisecond() -> None:
     """`<Time>` is decimal seconds, and two samples inside one second are two readings on
-    §6.5's millisecond axis where a whole-second one had them compete."""
+    §6.5's millisecond axis, each at its own place."""
     found = convert(
         suunto_xml(
             suunto_xml_samples(suunto_xml_sample(1, Depth="1.86"), suunto_xml_sample(1.6, Depth="2.14"))

From bb562ce1fa4fa600cd1299f5aaa154a437ee6b2d Mon Sep 17 00:00:00 2001
From: Aleksei Vesnin <aleksei@vesnin.me>
Date: Fri, 25 Sep 2026 06:31:24 +0300
Subject: [PATCH 6/9] Re-pin SPEC_REF at the specification's squash and
 re-vendor schema, fixtures and docs from it

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 SPEC_REF                                      |    2 +-
 docs/ssrf-mapping.md                          |   11 +-
 docs/uddf-mapping.md                          |    4 +-
 fixtures/README.md                            |    8 +-
 fixtures/fit/suunto-d5.divejson               |  808 +-
 fixtures/fit/suunto-ocean-2026.divejson       | 7656 ++++++-------
 fixtures/fit/suunto-ocean.divejson            | 9456 ++++++++---------
 fixtures/ssrf/refusals.divejson               |   12 +-
 fixtures/ssrf/subsurface.divejson             |   42 +-
 fixtures/ssrf/trip-grouping.divejson          |   16 +-
 fixtures/ssrf/trip-grouping.ssrf              |    2 +-
 fixtures/ssrf/two-computers.divejson          |   16 +-
 .../suunto_json/d5-deco-max-depth.divejson    |  160 +-
 .../suunto_json/d5-deep-stop-broken.divejson  |  106 +-
 fixtures/suunto_json/d5-stop-alarms.divejson  |  150 +-
 fixtures/suunto_json/ocean-deco-ppo2.divejson |  176 +-
 .../suunto_json/ocean-tank-pressure.divejson  |  140 +-
 .../suunto_json/purged-regulator.divejson     |   20 +-
 fixtures/suunto_json/suunto-d5.divejson       |   38 +-
 .../suunto_json/suunto-ocean-2026.divejson    |   56 +-
 fixtures/suunto_json/suunto-ocean.divejson    |   30 +-
 fixtures/suunto_xml/freedive.divejson         |   18 +-
 fixtures/suunto_xml/nitrox-deco.divejson      |   72 +-
 fixtures/suunto_xml/refusals.divejson         |   26 +-
 fixtures/suunto_xml/suunto-d5.divejson        |   44 +-
 .../suunto_xml/unlabelled-pressure.divejson   |   40 +-
 fixtures/uddf/divelogs.divejson               |   14 +-
 fixtures/uddf/legacy-writer.divejson          |   12 +-
 fixtures/uddf/opendiving.divejson             |   40 +-
 fixtures/uddf/shearwater-cloud-cns.divejson   |  166 +-
 fixtures/uddf/shearwater-cloud.divejson       |   96 +-
 fixtures/uddf/subsurface.divejson             |   28 +-
 fixtures/valid/technical-dive.divejson        |    5 +
 fixtures/write/uddf/technical-dive.divejson   |    5 +
 fixtures/write/uddf/technical-dive.uddf       |   15 +-
 35 files changed, 9762 insertions(+), 9728 deletions(-)

diff --git a/SPEC_REF b/SPEC_REF
index 446b2ef..3fc45e9 100644
--- a/SPEC_REF
+++ b/SPEC_REF
@@ -1 +1 @@
-ed56eb3ad88c1ecbb1bdb5313004ad7a2a61f6d2
+cdf4e03684b86f6d07e296d692d2f229d7476bee
diff --git a/docs/ssrf-mapping.md b/docs/ssrf-mapping.md
index 7949593..7820f6f 100644
--- a/docs/ssrf-mapping.md
+++ b/docs/ssrf-mapping.md
@@ -212,8 +212,9 @@ and cost the whole logbook.
 records no starting pair, so `cns_start` and `otu_start` have no source here. They sit on the
 `<dive>` rather than on a `<divecomputer>`, so they go where `converting.md` sends a
 dive-level readout: onto the primary recording, reported `resolved` where the dive has more
-than one, and onto a recording of their own where no `<divecomputer>` yields one. No pair
-here carries either figure on a two-computer dive.
+than one, and onto a recording of their own where no `<divecomputer>` yields one —
+`fixtures/ssrf/trip-grouping.ssrf`'s third dive is that case. No pair here carries either
+figure on a two-computer dive.
 
 Zero is read two different ways, which is `converting.md`'s zero rule meeting two members
 with different constraints. A `<depth @max>` or `@mean` of `0.0 m` is **not recorded** —
@@ -282,7 +283,7 @@ This format carries no device name and no device counter: `@diveid` is a per-div
 than a counter, and there is nowhere at all for a name — nothing in a `.ssrf` records what
 the diver called their computer.
 
-## This format settles no ambiguity
+## What this format leaves open
 
 `converting.md` defines a `resolved` finding for a value the source recorded whose scale,
 units or *meaning* are genuinely in doubt. **This reader emits one, and it is not about a
@@ -291,8 +292,8 @@ the file does not say whose figures they are. Past that the absence is a propert
 format rather than an omission. There is no scale to settle: every measurement states
 its unit, so there is no fraction-or-percent and no litres-or-cubic-metres for a magnitude
 test to reach. Where UDDF's `<o2>0.32</o2>` and `<o2>34</o2>` are both schema-valid and mean
-the same gas, `.ssrf` writes `o2='32.0%'` and there is nothing left to decide. And there is
-no meaning to settle either, so this document carries no generator table: one application
+the same gas, `.ssrf` writes `o2='32.0%'` and there is nothing left to decide. And no
+writer's meaning needs settling either, so this document carries no generator table: one application
 writes this format, its `<divelog @program>` says so on every file, and a table keyed on the
 writer needs two writers to tell apart.
 
diff --git a/docs/uddf-mapping.md b/docs/uddf-mapping.md
index b549c68..8cb1897 100644
--- a/docs/uddf-mapping.md
+++ b/docs/uddf-mapping.md
@@ -400,7 +400,9 @@ of day reported absent — `converting.md`'s rule, and not midnight, which neith
 states. Subsurface emits the first for a midnight dive, its stylesheet building the string
 with an unguarded concatenation; a dive that really began at midnight therefore comes back as
 its date, which is that writer's loss rather than a reading this reader could recover.
-Dropping the dive over either would lose a dive to a writer's typo.
+Dropping the dive over either would lose a dive to a writer's typo. A bare date carrying an
+offset, `2002-06-18+02:00`, reads as the same date-only start, with the offset reported
+dropped: an offset places an instant, and a day with no time of day has none to place.
 
 **`<surfacepressure>` is the dive's element and a recording's figure.** §6.4a puts the
 surface pressure a computer used on that computer's recording, and UDDF states one per dive,
diff --git a/fixtures/README.md b/fixtures/README.md
index 371cf43..2ad0138 100644
--- a/fixtures/README.md
+++ b/fixtures/README.md
@@ -33,7 +33,7 @@ what makes a fixture dropped into this tree impossible to ignore.
 | `minimal.divejson` | The smallest conforming document: `format`, `version`, `exported_at` — no diver (a source that records nothing about its owner omits the member), no collections (absent ≡ empty). |
 | `demo-logbook.divejson` | A real export of the reference writer's demo account (all names are seeded demo data; pulled 2026-09-02, courses-era writer): 8 dives, one carrying a recording with its device, its stored file and a full sampled profile, which is what a dive imported from a computer file looks like — sites, trips, an empty `courses` collection, gear with a service history, certifications, and producer extensions carrying application-specific values. Its device is written by hand: the export predates recordings, and the file it names was read by the `suunto_json` parser, so the device is what that reader takes from such a file. So are the diver's `phone`, `born_on`, `emergency_contacts` and `insurances`, one element in each array, which the export predates as well. Its profile axis is in milliseconds, multiplied by hand from the seconds the export wrote, and its root `extensions` carries, under the writer's producer key, the `profile_axis` marker that writer emits beside a millisecond axis and its own reader keys on — added by hand the same way, a value of the same kind as the `units` its diver carries. Regenerate from a fresh export when the writer changes. |
 | `two-computers.divejson` | Hand-built coverage of §6.4a, and of the half of it no converter can reach: a dive with **two** recordings that both carry a profile — `ssrf/two-computers.ssrf` reaches that much from one file — where the first holds **two** `source_files`, one recording the app exported twice, as JSON beside FIT, each file read by a different parser. Its second recording carries its own `started_at`, 31.33 s after the dive's, so its samples sit on their own axis. Each recording carries its own **readouts** (§6.4a), and they differ — the two answers a dive gets from two computers, which no converted pair reaches: the first carries a surface pressure and both ends of both oxygen clocks, its CNS and OTU ends being the ones the same dive's FIT export states, and the second a surface pressure of its own and nothing else. Its two devices differ in every way §6.4b allows two devices to differ, and the second computer's deepest sample is deeper than the dive's logged `max_depth`, which is the ordinary disagreement between two devices rather than a defect. It has no pair: §6.7's stored-file records are the application's and no reader produces one, which is the point of it. It is also where the two halves of §6.4c the other hand-built file cannot reach live: its first recording runs an RGBM model named in words with a **negative** `conservatism` and no gradient factors, the shape a Suunto states, while its second is in **`gauge`** mode and carries no `deco_model` at all — a computer run as a bottom timer runs no decompression model, and saying so is not the same as saying nothing. Between the two files every member of §6.4c's table and two of §6.4a's five `mode` values are exercised by a document no converter wrote; `freedive` comes from `suunto_xml/freedive.xml`, and `closed_circuit` and `semi_closed` wait for a file, no source in hand stating either. |
-| `technical-dive.divejson` | Hand-built coverage of what the demo corpus lacks: trimix, a sidemount pair (two cylinders, one blend, `usage: "parallel"`), staged deco cylinders, gas-switch events, a ceiling channel with a gap, per-cylinder pressure channels, a `+12:45` UTC offset **and** an offset-less local `started_at` (§5.2's third state), a dive with no recorded duration, a third dive whose `started_at` is a **date** — logged by hand with the day and no time of day (§5.2) — a common-name-only species, a trip of three parts — a place with dates, a place with none, and dates with no place — the second of them carrying an antimeridian-crossing bounding box, the corpus's only **dive site whose locality is filled in** — a full name, a centre and a box on `location`, beside the site's own pin at a different point, which is the pair §6.10 exists to keep apart — an `agency: "other"` certification with `front_file`/`back_file` and an `aida` one, a value from the widening that closed §6.16's vocabulary, a dive-count service interval, three courses — a completed `"other"`-agency course linked from a dive and its certification, an unreferenced `"planned"` one with no dates, and one with **no `agency`**, the private-instructor case §6.17 leaves the member out for — a lowercase-`z`, one-digit-fraction `created_at` (both spellings the grammar allows and naive parsers reject), and a `bookmark` 85 s **past** `profile.duration` — the surface-marker case §6.4 blesses, which the pre-2026-09-04 validator rejected, and which also carries a `label` beside a `type`, the pairing §6.6 asks for on any value defined after 1.0. Its recording's device carries **all six** of §6.4b's members, hand-built like the rest of the file. Its diver carries an emergency contact, an insurance with a `number` and a `portrait_file`, the three members of §6.1 UDDF has no element for. It is also the **decompression** fixture: `mode: "open_circuit"` and a Bühlmann `deco_model` with a name and a 30/70 gradient-factor pair, the recording's five readouts, a `salinity` of `en13319` on a dive whose `water_type` is `salt` — the setting and the water being two facts (§6.4a) — and all six of §6.4's readout channels sampled on the depth channel's own times — an `ndl` that runs from the 99-minute display cap down to zero and back, a zero `ndl` at the same second as a `ceiling` (the coexistence §6.4 blesses), a `tts` present only while there is an obligation, a `ppo2` that climbs through three gases, a `cns` whose ends are the recording's own `cns_start` and `cns_end`, and a `surface_gradient_factor` above 100 with the `gradient_factor` beside it far below. Its profile's `extensions` carries a tissue-loading array, which is what §6.4c says tissue state rides until a reader can compute from it. |
+| `technical-dive.divejson` | Hand-built coverage of what the demo corpus lacks: trimix, a sidemount pair (two cylinders, one blend, `usage: "parallel"`), staged deco cylinders, gas-switch events, a ceiling channel with a gap, per-cylinder pressure channels, a `+12:45` UTC offset **and** an offset-less local `started_at` (§5.2's third state), a dive with no recorded duration, a third dive whose `started_at` is a **date** — logged by hand with the day and no time of day (§5.2) — and whose one recording carries nothing but the `cns_end` copied off the computer, the readout-only recording §6.4a allows, a common-name-only species, a trip of three parts — a place with dates, a place with none, and dates with no place — the second of them carrying an antimeridian-crossing bounding box, the corpus's only **dive site whose locality is filled in** — a full name, a centre and a box on `location`, beside the site's own pin at a different point, which is the pair §6.10 exists to keep apart — an `agency: "other"` certification with `front_file`/`back_file` and an `aida` one, a value from the widening that closed §6.16's vocabulary, a dive-count service interval, three courses — a completed `"other"`-agency course linked from a dive and its certification, an unreferenced `"planned"` one with no dates, and one with **no `agency`**, the private-instructor case §6.17 leaves the member out for — a lowercase-`z`, one-digit-fraction `created_at` (both spellings the grammar allows and naive parsers reject), and a `bookmark` 85 s **past** `profile.duration` — the surface-marker case §6.4 blesses, which the pre-2026-09-04 validator rejected, and which also carries a `label` beside a `type`, the pairing §6.6 asks for on any value defined after 1.0. Its recording's device carries **all six** of §6.4b's members, hand-built like the rest of the file. Its diver carries an emergency contact, an insurance with a `number` and a `portrait_file`, the three members of §6.1 UDDF has no element for. It is also the **decompression** fixture: `mode: "open_circuit"` and a Bühlmann `deco_model` with a name and a 30/70 gradient-factor pair, the recording's five readouts, a `salinity` of `en13319` on a dive whose `water_type` is `salt` — the setting and the water being two facts (§6.4a) — and all six of §6.4's readout channels sampled on the depth channel's own times — an `ndl` that runs from the 99-minute display cap down to zero and back, a zero `ndl` at the same second as a `ceiling` (the coexistence §6.4 blesses), a `tts` present only while there is an obligation, a `ppo2` that climbs through three gases, a `cns` whose ends are the recording's own `cns_start` and `cns_end`, and a `surface_gradient_factor` above 100 with the `gradient_factor` beside it far below. Its profile's `extensions` carries a tissue-loading array, which is what §6.4c says tissue state rides until a reader can compute from it. |
 
 ## invalid/
 
@@ -48,7 +48,7 @@ carries the command that sorts the directory in one run.
 
 **Three of §3's rules now read *per recording*, and each keeps its defect off the first
 one** — `recording-without-content` puts the empty recording second, `non-increasing-samples`
-puts the bad channel in a second recording behind a device-only first, and
+puts the bad channel in a second recording behind a first that carries no profile, and
 `duplicate-file-uuid-across-recordings` spans two. A validator that walked only the primary
 recording would accept all three, which is exactly the implementation §6.4a's ordering rule
 invites and the only thing that catches it is a fixture that puts the defect where such a
@@ -179,7 +179,7 @@ format's document under [`docs/`](../docs).
 | --- | --- | --- |
 | `subsurface.ssrf` | Subsurface 6.0.x | The same two dives of the same logbook as `uddf/subsurface.uddf`, reduced from the save file the way that file is reduced from the UDDF export: the first dive keeps eight of its 431 depth samples and two of its 29 temperatures, sample for sample the same eight and two, which is what makes the two documents comparable. The second keeps all six of the profile Subsurface fabricates for a dive that has none, carried through as recorded — the UDDF fixture reduced that one to three. Also the site id `" ff47210"` with its leading space, a cylinder with a gas and one without, and the two attributes the reader reads, refuses and reports — `@model` was a third until it became a recording's device, which both dives here now carry. |
 | `two-computers.ssrf` | Subsurface 6.0.x | Two `<divecomputer>` elements on one dive **both carrying samples**, which no other input here has: two recordings each with a profile, where `refusals.ssrf`'s two-computer dive reaches only the device-only shape. The second element states its own `@date` and `@time`, 32 s after the dive's, so that recording carries a `started_at` of its own and its samples sit on their own axis (§6.5); the dive's `max_depth`, `avg_depth` and `bottom_temperature` are the **first** element's throughout, and the second's deeper `@max`, its own `@mean` and its warmer `<temperature>` are dropped and reported. It is also the only input here with `<extradata>`: the first computer's `Serial` and `FW Version` children become that recording's device serial and firmware, the two members no attribute of this format reaches, while the second computer carries a `@model` and nothing else. The same dive as `fit/suunto-ocean-2026.fit` and `suunto_json/suunto-ocean-2026.json`, which are that first computer's own exports of it. |
-| `trip-grouping.ssrf` | hand-built | A `<trip>` wrapping two dives with a third beside it, so the walk-through and the dropped grouping are both visible, and the positional identities run across the flattening. |
+| `trip-grouping.ssrf` | hand-built | A `<trip>` wrapping two dives with a third beside it, so the walk-through and the dropped grouping are both visible, and the positional identities run across the flattening. The third carries an `@cns` and an `@otu` beside a `<divecomputer>` that yields no recording, so the two figures arrive on a recording of their own — the readout-only recording §6.4a allows, and the pair that holds `docs/converting.md`'s rule for one. |
 | `refusals.ssrf` | hand-built | Everything this format's reader refuses: a `'150.6 ft'` maximum depth and a `'67.1 F'` sample temperature, a nameless site and the dive whose reference to it therefore resolves to nothing, a reference to a site nothing defines, a dive with no date, a `@time` with no seconds, two `<divecomputer>` elements on one dive, which since neither carries samples become two device-only recordings, the second stating a deeper maximum, its own mean and a warmer temperature than the first so that the first-element rule for a dive's three scalars is a rule the pair can hold a reader to — a sample with no time, two samples on one second, a zero start pressure beside a zero end pressure, a pressure past 350 bar, and a mix summing past 100 %. |
 
 ## fit/
@@ -244,5 +244,5 @@ point of each row below is which part of `uddf-writing.md` it reaches.
 | file | written from | what it covers |
 | --- | --- | --- |
 | `opendiving.divejson` | `uddf/opendiving.divejson`, plus a device | The round trip that matters most, and the pair that exercises almost none of the report: this document is itself the *reading* of a UDDF export, so there is nothing in it UDDF cannot hold, and the only finding is the `extensions` exclusion every written file carries. `dive-<uuid>` ids that come back as those uuids, a trip of one part, written back as the `<trippart>` with its dates and its place that it was read from, a kit list under `<equipment>` with per-dive `<equipmentused>` links, two cylinders on two gases with their pressure channels, a `<switchmix>` gas switch and a `<setmarker>`. And the **fold**: its dive lists that `computer` gear item, which satisfies the predicate's link leg, and its recording's device and the gear item carry the same serial, so the serial leg fires and the two become one `<divecomputer>` element carrying both halves, with the device's counter on the dive as `<internaldivenumber>`. It is the corpus's only pair that reaches the serial leg. **No pair reaches the link leg refusing** — a `computer` gear item the document carries and one of its own dives does not link — so that branch has no pair either way, and [`docs/uddf-writing.md`](../docs/uddf-writing.md) writes it down rather than leaving it to the first writer to meet one. Its diver's `born_on`, `phone` and insurance are written to `<birthdate>`, `<contact><phone>` and `<diveinsurances>`, which puts a `<contact>` between `<personal>` and `<equipment>` and the insurances after the kit list, the order `personType` fixes. |
-| `technical-dive.divejson` | `valid/technical-dive.divejson` | Everything the first one cannot reach, being hand-built to hold what no UDDF export carries. The `dropped` half of the report: `courses`, `certifications`, `gear_sets`, gear service and `species`, which UDDF has no slot for; `role` and `usage` on a sidemount pair and its staged deco cylinders; a ceiling channel; a trip part's bounding box, and a dive site's locality entire but for its name — its full name, its centre and its box, which is three findings off one record where the part loses one; the gas numbering UDDF cannot record; `shears` landing in `<variouspieces>` and reading back as `other`; a trip part whose location has coordinates and no full name, which loses the coordinates rather than borrowing the name; a `bookmark` carrying a label, which keeps its type and loses the label; an event with a label and no type, which goes out as a `<setmarker>` carrying the label; the `deco_model`, `tts` and `surface_gradient_factor` its document now carries, each reported `dropped` — the first because UDDF's `<decomodel>` requires a tissue table this format has no member for, the other two because UDDF has no element at all; an empty note, which no UDDF file can spell; a device's `firmware`, for which `equipmentPieceType` has no element; and the diver's `emergency_contacts` and `portrait_file` and an insurance's `number`, which UDDF has no element for either — the insurance itself is written, as a `<diveinsurances>` entry carrying its provider. It is also the **other** half of the device fold: its gear list holds no computer, so the device matches nothing and gets a `<divecomputer>` of its own with a non-UUID id and a `<link>` from the dive — the one case where reading the written file back returns a gear item the input never had. That its device carries a `name` is what puts it inside that exception rather than beside it: a nameless device on an element of its own gets an empty `<name>`, which comes back as no gear item at all. Its third dive starts on a date alone, the corpus's only such start going out, and is written as the bare `<datetime>` [`docs/uddf-writing.md`](../docs/uddf-writing.md) chooses over midnight; its recording's `salinity` and oxygen clocks are each reported `dropped`, while its surface pressure goes out as the dive's `<surfacepressure>`. The `absent` half is its second dive and its third trip part: no maximum depth, no duration and a cylinder with no start pressure, so `<greatestdepth>`, `<diveduration>` and `<tankpressurebegin>` are each written as the `0` a reader takes back off, and a part with no place gets the empty `<name>` `simpleNamedType` requires. Its trip is the corpus's only three-`<trippart>` one, and the three are the three shapes a part comes in: a place with dates, a place with none — which writes no `<dateoftrip>`, that being the one thing here that costs nothing — and dates with no place. |
+| `technical-dive.divejson` | `valid/technical-dive.divejson` | Everything the first one cannot reach, being hand-built to hold what no UDDF export carries. The `dropped` half of the report: `courses`, `certifications`, `gear_sets`, gear service and `species`, which UDDF has no slot for; `role` and `usage` on a sidemount pair and its staged deco cylinders; a ceiling channel; a trip part's bounding box, and a dive site's locality entire but for its name — its full name, its centre and its box, which is three findings off one record where the part loses one; the gas numbering UDDF cannot record; `shears` landing in `<variouspieces>` and reading back as `other`; a trip part whose location has coordinates and no full name, which loses the coordinates rather than borrowing the name; a `bookmark` carrying a label, which keeps its type and loses the label; an event with a label and no type, which goes out as a `<setmarker>` carrying the label; the `deco_model`, `tts` and `surface_gradient_factor` its document now carries, each reported `dropped` — the first because UDDF's `<decomodel>` requires a tissue table this format has no member for, the other two because UDDF has no element at all; an empty note, which no UDDF file can spell; a device's `firmware`, for which `equipmentPieceType` has no element; and the diver's `emergency_contacts` and `portrait_file` and an insurance's `number`, which UDDF has no element for either — the insurance itself is written, as a `<diveinsurances>` entry carrying its provider. It is also the **other** half of the device fold: its gear list holds no computer, so the device matches nothing and gets a `<divecomputer>` of its own with a non-UUID id and a `<link>` from the dive — the one case where reading the written file back returns a gear item the input never had. That its device carries a `name` is what puts it inside that exception rather than beside it: a nameless device on an element of its own gets an empty `<name>`, which comes back as no gear item at all. Its third dive starts on a date alone, the corpus's only such start going out, and is written as the bare `<datetime>` [`docs/uddf-writing.md`](../docs/uddf-writing.md) chooses over midnight, its readout-only recording reported `dropped` with nothing of it written; its recording's `salinity` and oxygen clocks are each reported `dropped`, while its surface pressure goes out as the dive's `<surfacepressure>`. The `absent` half is its second dive and its third trip part: no maximum depth, no duration and a cylinder with no start pressure, so `<greatestdepth>`, `<diveduration>` and `<tankpressurebegin>` are each written as the `0` a reader takes back off, and a part with no place gets the empty `<name>` `simpleNamedType` requires. Its trip is the corpus's only three-`<trippart>` one, and the three are the three shapes a part comes in: a place with dates, a place with none — which writes no `<dateoftrip>`, that being the one thing here that costs nothing — and dates with no place. |
 | `owner-profile-only.divejson` | `uddf/owner-profile-only.divejson` | The owner that records a person and names nobody, going out: a diver with a uuid and a `born_on` and no name or email still gets a `<diver>`, under `<owner id="diver-<uuid>">` because the document records something about the person, with the empty names `personalType` requires beside the `<birthdate>`. The written file is its reader pair's input again, `<generator>` aside. |
diff --git a/fixtures/fit/suunto-d5.divejson b/fixtures/fit/suunto-d5.divejson
index 71a6ef7..6f88c12 100644
--- a/fixtures/fit/suunto-d5.divejson
+++ b/fixtures/fit/suunto-d5.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-05T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.2.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -13,8 +13,6 @@
       "duration": 2001,
       "max_depth": 32.41,
       "avg_depth": 17.73,
-      "cns_end": 4.0,
-      "otu_end": 10.0,
       "cylinders": [
         {
           "oxygen": 21.0,
@@ -28,210 +26,212 @@
             "model": "Suunto D5",
             "dive_number": 5
           },
+          "cns_end": 4.0,
+          "otu_end": 10.0,
           "profile": {
-            "duration": 1992,
+            "duration": 1992000,
             "depth": {
               "times": [
-                1,
-                11,
-                21,
-                31,
-                41,
-                51,
-                61,
-                71,
-                81,
-                91,
-                101,
-                111,
-                121,
-                131,
-                141,
-                151,
-                161,
-                171,
-                181,
-                191,
-                201,
-                211,
-                221,
-                231,
-                241,
-                251,
-                261,
-                271,
-                281,
-                291,
-                301,
-                311,
-                321,
-                331,
-                341,
-                351,
-                361,
-                371,
-                381,
-                391,
-                401,
-                411,
-                421,
-                431,
-                441,
-                451,
-                461,
-                471,
-                481,
-                491,
-                501,
-                511,
-                521,
-                531,
-                541,
-                551,
-                561,
-                571,
-                581,
-                591,
-                601,
-                611,
-                621,
-                631,
-                641,
-                651,
-                661,
-                671,
-                681,
-                691,
-                701,
-                711,
-                721,
-                731,
-                741,
-                751,
-                761,
-                771,
-                781,
-                791,
-                801,
-                811,
-                821,
-                831,
-                841,
-                851,
-                861,
-                871,
-                881,
-                891,
-                901,
-                911,
-                921,
-                931,
-                941,
-                951,
-                961,
-                971,
-                981,
-                991,
-                1001,
-                1011,
-                1021,
-                1031,
-                1041,
-                1051,
-                1061,
-                1071,
-                1081,
-                1091,
-                1101,
-                1111,
-                1121,
-                1131,
-                1141,
-                1151,
-                1161,
-                1171,
-                1181,
-                1191,
-                1201,
-                1211,
-                1221,
-                1231,
-                1241,
-                1251,
-                1261,
-                1271,
-                1281,
-                1291,
-                1301,
-                1311,
-                1321,
-                1331,
-                1341,
-                1351,
-                1361,
-                1371,
-                1381,
-                1391,
-                1401,
-                1411,
-                1421,
-                1431,
-                1441,
-                1451,
-                1461,
-                1471,
-                1481,
-                1491,
-                1501,
-                1511,
-                1521,
-                1531,
-                1541,
-                1551,
-                1561,
-                1571,
-                1581,
-                1591,
-                1601,
-                1611,
-                1621,
-                1631,
-                1641,
-                1651,
-                1661,
-                1671,
-                1681,
-                1691,
-                1701,
-                1711,
-                1721,
-                1731,
-                1741,
-                1751,
-                1761,
-                1771,
-                1781,
-                1791,
-                1801,
-                1811,
-                1821,
-                1831,
-                1841,
-                1851,
-                1861,
-                1871,
-                1881,
-                1891,
-                1901,
-                1911,
-                1921,
-                1931,
-                1941,
-                1951,
-                1961,
-                1971,
-                1982,
-                1992
+                1000,
+                11000,
+                21000,
+                31000,
+                41000,
+                51000,
+                61000,
+                71000,
+                81000,
+                91000,
+                101000,
+                111000,
+                121000,
+                131000,
+                141000,
+                151000,
+                161000,
+                171000,
+                181000,
+                191000,
+                201000,
+                211000,
+                221000,
+                231000,
+                241000,
+                251000,
+                261000,
+                271000,
+                281000,
+                291000,
+                301000,
+                311000,
+                321000,
+                331000,
+                341000,
+                351000,
+                361000,
+                371000,
+                381000,
+                391000,
+                401000,
+                411000,
+                421000,
+                431000,
+                441000,
+                451000,
+                461000,
+                471000,
+                481000,
+                491000,
+                501000,
+                511000,
+                521000,
+                531000,
+                541000,
+                551000,
+                561000,
+                571000,
+                581000,
+                591000,
+                601000,
+                611000,
+                621000,
+                631000,
+                641000,
+                651000,
+                661000,
+                671000,
+                681000,
+                691000,
+                701000,
+                711000,
+                721000,
+                731000,
+                741000,
+                751000,
+                761000,
+                771000,
+                781000,
+                791000,
+                801000,
+                811000,
+                821000,
+                831000,
+                841000,
+                851000,
+                861000,
+                871000,
+                881000,
+                891000,
+                901000,
+                911000,
+                921000,
+                931000,
+                941000,
+                951000,
+                961000,
+                971000,
+                981000,
+                991000,
+                1001000,
+                1011000,
+                1021000,
+                1031000,
+                1041000,
+                1051000,
+                1061000,
+                1071000,
+                1081000,
+                1091000,
+                1101000,
+                1111000,
+                1121000,
+                1131000,
+                1141000,
+                1151000,
+                1161000,
+                1171000,
+                1181000,
+                1191000,
+                1201000,
+                1211000,
+                1221000,
+                1231000,
+                1241000,
+                1251000,
+                1261000,
+                1271000,
+                1281000,
+                1291000,
+                1301000,
+                1311000,
+                1321000,
+                1331000,
+                1341000,
+                1351000,
+                1361000,
+                1371000,
+                1381000,
+                1391000,
+                1401000,
+                1411000,
+                1421000,
+                1431000,
+                1441000,
+                1451000,
+                1461000,
+                1471000,
+                1481000,
+                1491000,
+                1501000,
+                1511000,
+                1521000,
+                1531000,
+                1541000,
+                1551000,
+                1561000,
+                1571000,
+                1581000,
+                1591000,
+                1601000,
+                1611000,
+                1621000,
+                1631000,
+                1641000,
+                1651000,
+                1661000,
+                1671000,
+                1681000,
+                1691000,
+                1701000,
+                1711000,
+                1721000,
+                1731000,
+                1741000,
+                1751000,
+                1761000,
+                1771000,
+                1781000,
+                1791000,
+                1801000,
+                1811000,
+                1821000,
+                1831000,
+                1841000,
+                1851000,
+                1861000,
+                1871000,
+                1881000,
+                1891000,
+                1901000,
+                1911000,
+                1921000,
+                1931000,
+                1941000,
+                1951000,
+                1961000,
+                1971000,
+                1982000,
+                1992000
               ],
               "values": [
                 186,
@@ -438,206 +438,206 @@
             },
             "temperature": {
               "times": [
-                1,
-                11,
-                21,
-                31,
-                41,
-                51,
-                61,
-                71,
-                81,
-                91,
-                101,
-                111,
-                121,
-                131,
-                141,
-                151,
-                161,
-                171,
-                181,
-                191,
-                201,
-                211,
-                221,
-                231,
-                241,
-                251,
-                261,
-                271,
-                281,
-                291,
-                301,
-                311,
-                321,
-                331,
-                341,
-                351,
-                361,
-                371,
-                381,
-                391,
-                401,
-                411,
-                421,
-                431,
-                441,
-                451,
-                461,
-                471,
-                481,
-                491,
-                501,
-                511,
-                521,
-                531,
-                541,
-                551,
-                561,
-                571,
-                581,
-                591,
-                601,
-                611,
-                621,
-                631,
-                641,
-                651,
-                661,
-                671,
-                681,
-                691,
-                701,
-                711,
-                721,
-                731,
-                741,
-                751,
-                761,
-                771,
-                781,
-                791,
-                801,
-                811,
-                821,
-                831,
-                841,
-                851,
-                861,
-                871,
-                881,
-                891,
-                901,
-                911,
-                921,
-                931,
-                941,
-                951,
-                961,
-                971,
-                981,
-                991,
-                1001,
-                1011,
-                1021,
-                1031,
-                1041,
-                1051,
-                1061,
-                1071,
-                1081,
-                1091,
-                1101,
-                1111,
-                1121,
-                1131,
-                1141,
-                1151,
-                1161,
-                1171,
-                1181,
-                1191,
-                1201,
-                1211,
-                1221,
-                1231,
-                1241,
-                1251,
-                1261,
-                1271,
-                1281,
-                1291,
-                1301,
-                1311,
-                1321,
-                1331,
-                1341,
-                1351,
-                1361,
-                1371,
-                1381,
-                1391,
-                1401,
-                1411,
-                1421,
-                1431,
-                1441,
-                1451,
-                1461,
-                1471,
-                1481,
-                1491,
-                1501,
-                1511,
-                1521,
-                1531,
-                1541,
-                1551,
-                1561,
-                1571,
-                1581,
-                1591,
-                1601,
-                1611,
-                1621,
-                1631,
-                1641,
-                1651,
-                1661,
-                1671,
-                1681,
-                1691,
-                1701,
-                1711,
-                1721,
-                1731,
-                1741,
-                1751,
-                1761,
-                1771,
-                1781,
-                1791,
-                1801,
-                1811,
-                1821,
-                1831,
-                1841,
-                1851,
-                1861,
-                1871,
-                1881,
-                1891,
-                1901,
-                1911,
-                1921,
-                1931,
-                1941,
-                1951,
-                1961,
-                1971,
-                1982,
-                1992
+                1000,
+                11000,
+                21000,
+                31000,
+                41000,
+                51000,
+                61000,
+                71000,
+                81000,
+                91000,
+                101000,
+                111000,
+                121000,
+                131000,
+                141000,
+                151000,
+                161000,
+                171000,
+                181000,
+                191000,
+                201000,
+                211000,
+                221000,
+                231000,
+                241000,
+                251000,
+                261000,
+                271000,
+                281000,
+                291000,
+                301000,
+                311000,
+                321000,
+                331000,
+                341000,
+                351000,
+                361000,
+                371000,
+                381000,
+                391000,
+                401000,
+                411000,
+                421000,
+                431000,
+                441000,
+                451000,
+                461000,
+                471000,
+                481000,
+                491000,
+                501000,
+                511000,
+                521000,
+                531000,
+                541000,
+                551000,
+                561000,
+                571000,
+                581000,
+                591000,
+                601000,
+                611000,
+                621000,
+                631000,
+                641000,
+                651000,
+                661000,
+                671000,
+                681000,
+                691000,
+                701000,
+                711000,
+                721000,
+                731000,
+                741000,
+                751000,
+                761000,
+                771000,
+                781000,
+                791000,
+                801000,
+                811000,
+                821000,
+                831000,
+                841000,
+                851000,
+                861000,
+                871000,
+                881000,
+                891000,
+                901000,
+                911000,
+                921000,
+                931000,
+                941000,
+                951000,
+                961000,
+                971000,
+                981000,
+                991000,
+                1001000,
+                1011000,
+                1021000,
+                1031000,
+                1041000,
+                1051000,
+                1061000,
+                1071000,
+                1081000,
+                1091000,
+                1101000,
+                1111000,
+                1121000,
+                1131000,
+                1141000,
+                1151000,
+                1161000,
+                1171000,
+                1181000,
+                1191000,
+                1201000,
+                1211000,
+                1221000,
+                1231000,
+                1241000,
+                1251000,
+                1261000,
+                1271000,
+                1281000,
+                1291000,
+                1301000,
+                1311000,
+                1321000,
+                1331000,
+                1341000,
+                1351000,
+                1361000,
+                1371000,
+                1381000,
+                1391000,
+                1401000,
+                1411000,
+                1421000,
+                1431000,
+                1441000,
+                1451000,
+                1461000,
+                1471000,
+                1481000,
+                1491000,
+                1501000,
+                1511000,
+                1521000,
+                1531000,
+                1541000,
+                1551000,
+                1561000,
+                1571000,
+                1581000,
+                1591000,
+                1601000,
+                1611000,
+                1621000,
+                1631000,
+                1641000,
+                1651000,
+                1661000,
+                1671000,
+                1681000,
+                1691000,
+                1701000,
+                1711000,
+                1721000,
+                1731000,
+                1741000,
+                1751000,
+                1761000,
+                1771000,
+                1781000,
+                1791000,
+                1801000,
+                1811000,
+                1821000,
+                1831000,
+                1841000,
+                1851000,
+                1861000,
+                1871000,
+                1881000,
+                1891000,
+                1901000,
+                1911000,
+                1921000,
+                1931000,
+                1941000,
+                1951000,
+                1961000,
+                1971000,
+                1982000,
+                1992000
               ],
               "values": [
                 240,
diff --git a/fixtures/fit/suunto-ocean-2026.divejson b/fixtures/fit/suunto-ocean-2026.divejson
index fc03c82..dcd0fde 100644
--- a/fixtures/fit/suunto-ocean-2026.divejson
+++ b/fixtures/fit/suunto-ocean-2026.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-05T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.4.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -13,8 +13,6 @@
       "duration": 3474,
       "max_depth": 19.04,
       "avg_depth": 9.49,
-      "cns_end": 9.0,
-      "otu_end": 22.0,
       "exit_position": {
         "latitude": 28.496523,
         "longitude": 34.516778
@@ -36,371 +34,373 @@
             "gf_low": 50,
             "gf_high": 85
           },
+          "cns_end": 9.0,
+          "otu_end": 22.0,
           "profile": {
-            "duration": 3473,
+            "duration": 3473000,
             "depth": {
               "times": [
-                1,
-                10,
-                20,
-                30,
-                40,
-                50,
-                60,
-                70,
-                80,
-                90,
-                100,
-                110,
-                120,
-                130,
-                140,
-                150,
-                160,
-                170,
-                180,
-                190,
-                200,
-                210,
-                220,
-                230,
-                240,
-                250,
-                260,
-                270,
-                280,
-                290,
-                300,
-                310,
-                320,
-                330,
-                340,
-                350,
-                360,
-                370,
-                380,
-                390,
-                400,
-                410,
-                420,
-                430,
-                440,
-                450,
-                460,
-                470,
-                480,
-                490,
-                491,
-                500,
-                510,
-                520,
-                530,
-                540,
-                550,
-                560,
-                570,
-                580,
-                590,
-                600,
-                610,
-                620,
-                630,
-                640,
-                650,
-                660,
-                670,
-                680,
-                690,
-                700,
-                710,
-                720,
-                730,
-                740,
-                750,
-                760,
-                770,
-                780,
-                790,
-                800,
-                810,
-                820,
-                830,
-                840,
-                850,
-                860,
-                870,
-                880,
-                890,
-                900,
-                910,
-                920,
-                930,
-                940,
-                950,
-                960,
-                970,
-                980,
-                990,
                 1000,
-                1010,
-                1020,
-                1030,
-                1040,
-                1050,
-                1060,
-                1070,
-                1080,
-                1090,
-                1100,
-                1110,
-                1120,
-                1130,
-                1140,
-                1150,
-                1160,
-                1170,
-                1180,
-                1190,
-                1200,
-                1210,
-                1220,
-                1230,
-                1240,
-                1250,
-                1260,
-                1270,
-                1280,
-                1290,
-                1300,
-                1310,
-                1320,
-                1330,
-                1340,
-                1350,
-                1360,
-                1370,
-                1380,
-                1390,
-                1400,
-                1410,
-                1420,
-                1430,
-                1440,
-                1450,
-                1460,
-                1470,
-                1480,
-                1490,
-                1500,
-                1510,
-                1520,
-                1530,
-                1540,
-                1550,
-                1560,
-                1570,
-                1580,
-                1590,
-                1600,
-                1610,
-                1620,
-                1630,
-                1640,
-                1650,
-                1660,
-                1670,
-                1680,
-                1690,
-                1700,
-                1710,
-                1720,
-                1730,
-                1740,
-                1750,
-                1760,
-                1770,
-                1780,
-                1790,
-                1800,
-                1810,
-                1820,
-                1830,
-                1840,
-                1850,
-                1860,
-                1870,
-                1880,
-                1890,
-                1900,
-                1910,
-                1920,
-                1930,
-                1940,
-                1950,
-                1960,
-                1970,
-                1980,
-                1990,
-                2000,
-                2010,
-                2020,
-                2030,
-                2040,
-                2050,
-                2060,
-                2070,
-                2080,
-                2090,
-                2100,
-                2110,
-                2120,
-                2130,
-                2140,
-                2150,
-                2160,
-                2170,
-                2180,
-                2190,
-                2200,
-                2210,
-                2220,
-                2230,
-                2240,
-                2250,
-                2260,
-                2270,
-                2280,
-                2290,
-                2300,
-                2310,
-                2320,
-                2330,
-                2340,
-                2350,
-                2360,
-                2370,
-                2380,
-                2390,
-                2400,
-                2410,
-                2420,
-                2430,
-                2440,
-                2450,
-                2460,
-                2470,
-                2480,
-                2490,
-                2500,
-                2501,
-                2510,
-                2520,
-                2527,
-                2530,
-                2540,
-                2550,
-                2560,
-                2563,
-                2570,
-                2580,
-                2581,
-                2585,
-                2587,
-                2590,
-                2600,
-                2610,
-                2620,
-                2630,
-                2640,
-                2650,
-                2651,
-                2658,
-                2660,
-                2670,
-                2680,
-                2690,
-                2700,
-                2710,
-                2720,
-                2730,
-                2740,
-                2750,
-                2760,
-                2770,
-                2780,
-                2790,
-                2800,
-                2810,
-                2820,
-                2830,
-                2840,
-                2850,
-                2860,
-                2870,
-                2880,
-                2890,
-                2900,
-                2910,
-                2920,
-                2930,
-                2940,
-                2947,
-                2948,
-                2950,
-                2960,
-                2970,
-                2980,
-                2990,
-                3000,
-                3010,
-                3018,
-                3020,
-                3030,
-                3040,
-                3050,
-                3060,
-                3070,
-                3080,
-                3090,
-                3100,
-                3110,
-                3120,
-                3130,
-                3140,
-                3150,
-                3160,
-                3166,
-                3170,
-                3180,
-                3190,
-                3200,
-                3210,
-                3220,
-                3230,
-                3240,
-                3250,
-                3260,
-                3270,
-                3280,
-                3290,
-                3300,
-                3310,
-                3320,
-                3330,
-                3340,
-                3350,
-                3360,
-                3370,
-                3380,
-                3390,
-                3400,
-                3410,
-                3420,
-                3430,
-                3440,
-                3450,
-                3460,
-                3470
+                10000,
+                20000,
+                30000,
+                40000,
+                50000,
+                60000,
+                70000,
+                80000,
+                90000,
+                100000,
+                110000,
+                120000,
+                130000,
+                140000,
+                150000,
+                160000,
+                170000,
+                180000,
+                190000,
+                200000,
+                210000,
+                220000,
+                230000,
+                240000,
+                250000,
+                260000,
+                270000,
+                280000,
+                290000,
+                300000,
+                310000,
+                320000,
+                330000,
+                340000,
+                350000,
+                360000,
+                370000,
+                380000,
+                390000,
+                400000,
+                410000,
+                420000,
+                430000,
+                440000,
+                450000,
+                460000,
+                470000,
+                480000,
+                490000,
+                491000,
+                500000,
+                510000,
+                520000,
+                530000,
+                540000,
+                550000,
+                560000,
+                570000,
+                580000,
+                590000,
+                600000,
+                610000,
+                620000,
+                630000,
+                640000,
+                650000,
+                660000,
+                670000,
+                680000,
+                690000,
+                700000,
+                710000,
+                720000,
+                730000,
+                740000,
+                750000,
+                760000,
+                770000,
+                780000,
+                790000,
+                800000,
+                810000,
+                820000,
+                830000,
+                840000,
+                850000,
+                860000,
+                870000,
+                880000,
+                890000,
+                900000,
+                910000,
+                920000,
+                930000,
+                940000,
+                950000,
+                960000,
+                970000,
+                980000,
+                990000,
+                1000000,
+                1010000,
+                1020000,
+                1030000,
+                1040000,
+                1050000,
+                1060000,
+                1070000,
+                1080000,
+                1090000,
+                1100000,
+                1110000,
+                1120000,
+                1130000,
+                1140000,
+                1150000,
+                1160000,
+                1170000,
+                1180000,
+                1190000,
+                1200000,
+                1210000,
+                1220000,
+                1230000,
+                1240000,
+                1250000,
+                1260000,
+                1270000,
+                1280000,
+                1290000,
+                1300000,
+                1310000,
+                1320000,
+                1330000,
+                1340000,
+                1350000,
+                1360000,
+                1370000,
+                1380000,
+                1390000,
+                1400000,
+                1410000,
+                1420000,
+                1430000,
+                1440000,
+                1450000,
+                1460000,
+                1470000,
+                1480000,
+                1490000,
+                1500000,
+                1510000,
+                1520000,
+                1530000,
+                1540000,
+                1550000,
+                1560000,
+                1570000,
+                1580000,
+                1590000,
+                1600000,
+                1610000,
+                1620000,
+                1630000,
+                1640000,
+                1650000,
+                1660000,
+                1670000,
+                1680000,
+                1690000,
+                1700000,
+                1710000,
+                1720000,
+                1730000,
+                1740000,
+                1750000,
+                1760000,
+                1770000,
+                1780000,
+                1790000,
+                1800000,
+                1810000,
+                1820000,
+                1830000,
+                1840000,
+                1850000,
+                1860000,
+                1870000,
+                1880000,
+                1890000,
+                1900000,
+                1910000,
+                1920000,
+                1930000,
+                1940000,
+                1950000,
+                1960000,
+                1970000,
+                1980000,
+                1990000,
+                2000000,
+                2010000,
+                2020000,
+                2030000,
+                2040000,
+                2050000,
+                2060000,
+                2070000,
+                2080000,
+                2090000,
+                2100000,
+                2110000,
+                2120000,
+                2130000,
+                2140000,
+                2150000,
+                2160000,
+                2170000,
+                2180000,
+                2190000,
+                2200000,
+                2210000,
+                2220000,
+                2230000,
+                2240000,
+                2250000,
+                2260000,
+                2270000,
+                2280000,
+                2290000,
+                2300000,
+                2310000,
+                2320000,
+                2330000,
+                2340000,
+                2350000,
+                2360000,
+                2370000,
+                2380000,
+                2390000,
+                2400000,
+                2410000,
+                2420000,
+                2430000,
+                2440000,
+                2450000,
+                2460000,
+                2470000,
+                2480000,
+                2490000,
+                2500000,
+                2501000,
+                2510000,
+                2520000,
+                2527000,
+                2530000,
+                2540000,
+                2550000,
+                2560000,
+                2563000,
+                2570000,
+                2580000,
+                2581000,
+                2585000,
+                2587000,
+                2590000,
+                2600000,
+                2610000,
+                2620000,
+                2630000,
+                2640000,
+                2650000,
+                2651000,
+                2658000,
+                2660000,
+                2670000,
+                2680000,
+                2690000,
+                2700000,
+                2710000,
+                2720000,
+                2730000,
+                2740000,
+                2750000,
+                2760000,
+                2770000,
+                2780000,
+                2790000,
+                2800000,
+                2810000,
+                2820000,
+                2830000,
+                2840000,
+                2850000,
+                2860000,
+                2870000,
+                2880000,
+                2890000,
+                2900000,
+                2910000,
+                2920000,
+                2930000,
+                2940000,
+                2947000,
+                2948000,
+                2950000,
+                2960000,
+                2970000,
+                2980000,
+                2990000,
+                3000000,
+                3010000,
+                3018000,
+                3020000,
+                3030000,
+                3040000,
+                3050000,
+                3060000,
+                3070000,
+                3080000,
+                3090000,
+                3100000,
+                3110000,
+                3120000,
+                3130000,
+                3140000,
+                3150000,
+                3160000,
+                3166000,
+                3170000,
+                3180000,
+                3190000,
+                3200000,
+                3210000,
+                3220000,
+                3230000,
+                3240000,
+                3250000,
+                3260000,
+                3270000,
+                3280000,
+                3290000,
+                3300000,
+                3310000,
+                3320000,
+                3330000,
+                3340000,
+                3350000,
+                3360000,
+                3370000,
+                3380000,
+                3390000,
+                3400000,
+                3410000,
+                3420000,
+                3430000,
+                3440000,
+                3450000,
+                3460000,
+                3470000
               ],
               "values": [
                 137,
@@ -768,3470 +768,3470 @@
             },
             "temperature": {
               "times": [
-                8,
-                9,
-                10,
-                11,
-                12,
-                13,
-                14,
-                15,
-                16,
-                17,
-                18,
-                19,
-                20,
-                21,
-                22,
-                23,
-                24,
-                25,
-                26,
-                27,
-                28,
-                29,
-                30,
-                31,
-                32,
-                33,
-                34,
-                35,
-                36,
-                37,
-                38,
-                39,
-                40,
-                41,
-                42,
-                43,
-                44,
-                45,
-                46,
-                47,
-                48,
-                49,
-                50,
-                51,
-                52,
-                53,
-                54,
-                55,
-                56,
-                57,
-                58,
-                59,
-                60,
-                61,
-                62,
-                63,
-                64,
-                65,
-                66,
-                67,
-                68,
-                69,
-                70,
-                71,
-                72,
-                73,
-                74,
-                75,
-                76,
-                77,
-                78,
-                79,
-                80,
-                81,
-                82,
-                83,
-                84,
-                85,
-                86,
-                87,
-                88,
-                89,
-                90,
-                91,
-                92,
-                93,
-                94,
-                95,
-                96,
-                97,
-                98,
-                99,
-                100,
-                101,
-                102,
-                103,
-                104,
-                105,
-                106,
-                107,
-                108,
-                109,
-                110,
-                111,
-                112,
-                113,
-                114,
-                115,
-                116,
-                117,
-                118,
-                119,
-                120,
-                121,
-                122,
-                123,
-                124,
-                125,
-                126,
-                127,
-                128,
-                129,
-                130,
-                131,
-                132,
-                133,
-                134,
-                135,
-                136,
-                137,
-                138,
-                139,
-                140,
-                141,
-                142,
-                143,
-                144,
-                145,
-                146,
-                147,
-                148,
-                149,
-                150,
-                151,
-                152,
-                153,
-                154,
-                155,
-                156,
-                157,
-                158,
-                159,
-                160,
-                161,
-                162,
-                163,
-                164,
-                165,
-                166,
-                167,
-                168,
-                169,
-                170,
-                171,
-                172,
-                173,
-                174,
-                175,
-                176,
-                177,
-                178,
-                179,
-                180,
-                181,
-                182,
-                183,
-                184,
-                185,
-                186,
-                187,
-                188,
-                189,
-                190,
-                191,
-                192,
-                193,
-                194,
-                195,
-                196,
-                197,
-                198,
-                199,
-                200,
-                201,
-                202,
-                203,
-                204,
-                205,
-                206,
-                207,
-                208,
-                209,
-                210,
-                211,
-                212,
-                213,
-                214,
-                215,
-                216,
-                217,
-                218,
-                219,
-                220,
-                221,
-                222,
-                223,
-                224,
-                225,
-                226,
-                227,
-                228,
-                229,
-                230,
-                231,
-                232,
-                233,
-                234,
-                235,
-                236,
-                237,
-                238,
-                239,
-                240,
-                241,
-                242,
-                243,
-                244,
-                245,
-                246,
-                247,
-                248,
-                249,
-                250,
-                251,
-                252,
-                253,
-                254,
-                255,
-                256,
-                257,
-                258,
-                259,
-                260,
-                261,
-                262,
-                263,
-                264,
-                265,
-                266,
-                267,
-                268,
-                269,
-                270,
-                271,
-                272,
-                273,
-                274,
-                275,
-                276,
-                277,
-                278,
-                279,
-                280,
-                281,
-                282,
-                283,
-                284,
-                285,
-                286,
-                287,
-                288,
-                289,
-                290,
-                291,
-                292,
-                293,
-                294,
-                295,
-                296,
-                297,
-                298,
-                299,
-                300,
-                301,
-                302,
-                303,
-                304,
-                305,
-                306,
-                307,
-                308,
-                309,
-                310,
-                311,
-                312,
-                313,
-                314,
-                315,
-                316,
-                317,
-                318,
-                319,
-                320,
-                321,
-                322,
-                323,
-                324,
-                325,
-                326,
-                327,
-                328,
-                329,
-                330,
-                331,
-                332,
-                333,
-                334,
-                335,
-                336,
-                337,
-                338,
-                339,
-                340,
-                341,
-                342,
-                343,
-                344,
-                345,
-                346,
-                347,
-                348,
-                349,
-                350,
-                351,
-                352,
-                353,
-                354,
-                355,
-                356,
-                357,
-                358,
-                359,
-                360,
-                361,
-                362,
-                363,
-                364,
-                365,
-                366,
-                367,
-                368,
-                369,
-                370,
-                371,
-                372,
-                373,
-                374,
-                375,
-                376,
-                377,
-                378,
-                379,
-                380,
-                381,
-                382,
-                383,
-                384,
-                385,
-                386,
-                387,
-                388,
-                389,
-                390,
-                391,
-                392,
-                393,
-                394,
-                395,
-                396,
-                397,
-                398,
-                399,
-                400,
-                401,
-                402,
-                403,
-                404,
-                405,
-                406,
-                407,
-                408,
-                409,
-                410,
-                411,
-                412,
-                413,
-                414,
-                415,
-                416,
-                417,
-                418,
-                419,
-                420,
-                421,
-                422,
-                423,
-                424,
-                425,
-                426,
-                427,
-                428,
-                429,
-                430,
-                431,
-                432,
-                433,
-                434,
-                435,
-                436,
-                437,
-                438,
-                439,
-                440,
-                441,
-                442,
-                443,
-                444,
-                445,
-                446,
-                447,
-                448,
-                449,
-                450,
-                451,
-                452,
-                453,
-                454,
-                455,
-                456,
-                457,
-                458,
-                459,
-                460,
-                461,
-                462,
-                463,
-                464,
-                465,
-                466,
-                467,
-                468,
-                469,
-                470,
-                471,
-                472,
-                473,
-                474,
-                475,
-                476,
-                477,
-                478,
-                479,
-                480,
-                481,
-                482,
-                483,
-                484,
-                485,
-                486,
-                487,
-                488,
-                489,
-                490,
-                491,
-                492,
-                493,
-                494,
-                495,
-                496,
-                497,
-                498,
-                499,
-                500,
-                501,
-                502,
-                503,
-                504,
-                505,
-                506,
-                507,
-                508,
-                509,
-                510,
-                511,
-                512,
-                513,
-                514,
-                515,
-                516,
-                517,
-                518,
-                519,
-                520,
-                521,
-                522,
-                523,
-                524,
-                525,
-                526,
-                527,
-                528,
-                529,
-                530,
-                531,
-                532,
-                533,
-                534,
-                535,
-                536,
-                537,
-                538,
-                539,
-                540,
-                541,
-                542,
-                543,
-                544,
-                545,
-                546,
-                547,
-                548,
-                549,
-                550,
-                551,
-                552,
-                553,
-                554,
-                555,
-                556,
-                557,
-                558,
-                559,
-                560,
-                561,
-                562,
-                563,
-                564,
-                565,
-                566,
-                567,
-                568,
-                569,
-                570,
-                571,
-                572,
-                573,
-                574,
-                575,
-                576,
-                577,
-                578,
-                579,
-                580,
-                581,
-                582,
-                583,
-                584,
-                585,
-                586,
-                587,
-                588,
-                589,
-                590,
-                591,
-                592,
-                593,
-                594,
-                595,
-                596,
-                597,
-                598,
-                599,
-                600,
-                601,
-                602,
-                603,
-                604,
-                605,
-                606,
-                607,
-                608,
-                609,
-                610,
-                611,
-                612,
-                613,
-                614,
-                615,
-                616,
-                617,
-                618,
-                619,
-                620,
-                621,
-                622,
-                623,
-                624,
-                625,
-                626,
-                627,
-                628,
-                629,
-                630,
-                631,
-                632,
-                633,
-                634,
-                635,
-                636,
-                637,
-                638,
-                639,
-                640,
-                641,
-                642,
-                643,
-                644,
-                645,
-                646,
-                647,
-                648,
-                649,
-                650,
-                651,
-                652,
-                653,
-                654,
-                655,
-                656,
-                657,
-                658,
-                659,
-                660,
-                661,
-                662,
-                663,
-                664,
-                665,
-                666,
-                667,
-                668,
-                669,
-                670,
-                671,
-                672,
-                673,
-                674,
-                675,
-                676,
-                677,
-                678,
-                679,
-                680,
-                681,
-                682,
-                683,
-                684,
-                685,
-                686,
-                687,
-                688,
-                689,
-                690,
-                691,
-                692,
-                693,
-                694,
-                695,
-                696,
-                697,
-                698,
-                699,
-                700,
-                701,
-                702,
-                703,
-                704,
-                705,
-                706,
-                707,
-                708,
-                709,
-                710,
-                711,
-                712,
-                713,
-                714,
-                715,
-                716,
-                717,
-                718,
-                719,
-                720,
-                721,
-                722,
-                723,
-                724,
-                725,
-                726,
-                727,
-                728,
-                729,
-                730,
-                731,
-                732,
-                733,
-                734,
-                735,
-                736,
-                737,
-                738,
-                739,
-                740,
-                741,
-                742,
-                743,
-                744,
-                745,
-                746,
-                747,
-                748,
-                749,
-                750,
-                751,
-                752,
-                753,
-                754,
-                755,
-                756,
-                757,
-                758,
-                759,
-                760,
-                761,
-                762,
-                763,
-                764,
-                765,
-                766,
-                767,
-                768,
-                769,
-                770,
-                771,
-                772,
-                773,
-                774,
-                775,
-                776,
-                777,
-                778,
-                779,
-                780,
-                781,
-                782,
-                783,
-                784,
-                785,
-                786,
-                787,
-                788,
-                789,
-                790,
-                791,
-                792,
-                793,
-                794,
-                795,
-                796,
-                797,
-                798,
-                799,
-                800,
-                801,
-                802,
-                803,
-                804,
-                805,
-                806,
-                807,
-                808,
-                809,
-                810,
-                811,
-                812,
-                813,
-                814,
-                815,
-                816,
-                817,
-                818,
-                819,
-                820,
-                821,
-                822,
-                823,
-                824,
-                825,
-                826,
-                827,
-                828,
-                829,
-                830,
-                831,
-                832,
-                833,
-                834,
-                835,
-                836,
-                837,
-                838,
-                839,
-                840,
-                841,
-                842,
-                843,
-                844,
-                845,
-                846,
-                847,
-                848,
-                849,
-                850,
-                851,
-                852,
-                853,
-                854,
-                855,
-                856,
-                857,
-                858,
-                859,
-                860,
-                861,
-                862,
-                863,
-                864,
-                865,
-                866,
-                867,
-                868,
-                869,
-                870,
-                871,
-                872,
-                873,
-                874,
-                875,
-                876,
-                877,
-                878,
-                879,
-                880,
-                881,
-                882,
-                883,
-                884,
-                885,
-                886,
-                887,
-                888,
-                889,
-                890,
-                891,
-                892,
-                893,
-                894,
-                895,
-                896,
-                897,
-                898,
-                899,
-                900,
-                901,
-                902,
-                903,
-                904,
-                905,
-                906,
-                907,
-                908,
-                909,
-                910,
-                911,
-                912,
-                913,
-                914,
-                915,
-                916,
-                917,
-                918,
-                919,
-                920,
-                921,
-                922,
-                923,
-                924,
-                925,
-                926,
-                927,
-                928,
-                929,
-                930,
-                931,
-                932,
-                933,
-                934,
-                935,
-                936,
-                937,
-                938,
-                939,
-                940,
-                941,
-                942,
-                943,
-                944,
-                945,
-                946,
-                947,
-                948,
-                949,
-                950,
-                951,
-                952,
-                953,
-                954,
-                955,
-                956,
-                957,
-                958,
-                959,
-                960,
-                961,
-                962,
-                963,
-                964,
-                965,
-                966,
-                967,
-                968,
-                969,
-                970,
-                971,
-                972,
-                973,
-                974,
-                975,
-                976,
-                977,
-                978,
-                979,
-                980,
-                981,
-                982,
-                983,
-                984,
-                985,
-                986,
-                987,
-                988,
-                989,
-                990,
-                991,
-                992,
-                993,
-                994,
-                995,
-                996,
-                997,
-                998,
-                999,
-                1000,
-                1001,
-                1002,
-                1003,
-                1004,
-                1005,
-                1006,
-                1007,
-                1008,
-                1009,
-                1010,
-                1011,
-                1012,
-                1013,
-                1014,
-                1015,
-                1016,
-                1017,
-                1018,
-                1019,
-                1020,
-                1021,
-                1022,
-                1023,
-                1024,
-                1025,
-                1026,
-                1027,
-                1028,
-                1029,
-                1030,
-                1031,
-                1032,
-                1033,
-                1034,
-                1035,
-                1036,
-                1037,
-                1038,
-                1039,
-                1040,
-                1041,
-                1042,
-                1043,
-                1044,
-                1045,
-                1046,
-                1047,
-                1048,
-                1049,
-                1050,
-                1051,
-                1052,
-                1053,
-                1054,
-                1055,
-                1056,
-                1057,
-                1058,
-                1059,
-                1060,
-                1061,
-                1062,
-                1063,
-                1064,
-                1065,
-                1066,
-                1067,
-                1068,
-                1069,
-                1070,
-                1071,
-                1072,
-                1073,
-                1074,
-                1075,
-                1076,
-                1077,
-                1078,
-                1079,
-                1080,
-                1081,
-                1082,
-                1083,
-                1084,
-                1085,
-                1086,
-                1087,
-                1088,
-                1089,
-                1090,
-                1091,
-                1092,
-                1093,
-                1094,
-                1095,
-                1096,
-                1097,
-                1098,
-                1099,
-                1100,
-                1101,
-                1102,
-                1103,
-                1104,
-                1105,
-                1106,
-                1107,
-                1108,
-                1109,
-                1110,
-                1111,
-                1112,
-                1113,
-                1114,
-                1115,
-                1116,
-                1117,
-                1118,
-                1119,
-                1120,
-                1121,
-                1122,
-                1123,
-                1124,
-                1125,
-                1126,
-                1127,
-                1128,
-                1129,
-                1130,
-                1131,
-                1132,
-                1133,
-                1134,
-                1135,
-                1136,
-                1137,
-                1138,
-                1139,
-                1140,
-                1141,
-                1142,
-                1143,
-                1144,
-                1145,
-                1146,
-                1147,
-                1148,
-                1149,
-                1150,
-                1151,
-                1152,
-                1153,
-                1154,
-                1155,
-                1156,
-                1157,
-                1158,
-                1159,
-                1160,
-                1161,
-                1162,
-                1163,
-                1164,
-                1165,
-                1166,
-                1167,
-                1168,
-                1169,
-                1170,
-                1171,
-                1172,
-                1173,
-                1174,
-                1175,
-                1176,
-                1177,
-                1178,
-                1179,
-                1180,
-                1181,
-                1182,
-                1183,
-                1184,
-                1185,
-                1186,
-                1187,
-                1188,
-                1189,
-                1190,
-                1191,
-                1192,
-                1193,
-                1194,
-                1195,
-                1196,
-                1197,
-                1198,
-                1199,
-                1200,
-                1201,
-                1202,
-                1203,
-                1204,
-                1205,
-                1206,
-                1207,
-                1208,
-                1209,
-                1210,
-                1211,
-                1212,
-                1213,
-                1214,
-                1215,
-                1216,
-                1217,
-                1218,
-                1219,
-                1220,
-                1221,
-                1222,
-                1223,
-                1224,
-                1225,
-                1226,
-                1227,
-                1228,
-                1229,
-                1230,
-                1231,
-                1232,
-                1233,
-                1234,
-                1235,
-                1236,
-                1237,
-                1238,
-                1239,
-                1240,
-                1241,
-                1242,
-                1243,
-                1244,
-                1245,
-                1246,
-                1247,
-                1248,
-                1249,
-                1250,
-                1251,
-                1252,
-                1253,
-                1254,
-                1255,
-                1256,
-                1257,
-                1258,
-                1259,
-                1260,
-                1261,
-                1262,
-                1263,
-                1264,
-                1265,
-                1266,
-                1267,
-                1268,
-                1269,
-                1270,
-                1271,
-                1272,
-                1273,
-                1274,
-                1275,
-                1276,
-                1277,
-                1278,
-                1279,
-                1280,
-                1281,
-                1282,
-                1283,
-                1284,
-                1285,
-                1286,
-                1287,
-                1288,
-                1289,
-                1290,
-                1291,
-                1292,
-                1293,
-                1294,
-                1295,
-                1296,
-                1297,
-                1298,
-                1299,
-                1300,
-                1301,
-                1302,
-                1303,
-                1304,
-                1305,
-                1306,
-                1307,
-                1308,
-                1309,
-                1310,
-                1311,
-                1312,
-                1313,
-                1314,
-                1315,
-                1316,
-                1317,
-                1318,
-                1319,
-                1320,
-                1321,
-                1322,
-                1323,
-                1324,
-                1325,
-                1326,
-                1327,
-                1328,
-                1329,
-                1330,
-                1331,
-                1332,
-                1333,
-                1334,
-                1335,
-                1336,
-                1337,
-                1338,
-                1339,
-                1340,
-                1341,
-                1342,
-                1343,
-                1344,
-                1345,
-                1346,
-                1347,
-                1348,
-                1349,
-                1350,
-                1351,
-                1352,
-                1353,
-                1354,
-                1355,
-                1356,
-                1357,
-                1358,
-                1359,
-                1360,
-                1361,
-                1362,
-                1363,
-                1364,
-                1365,
-                1366,
-                1367,
-                1368,
-                1369,
-                1370,
-                1371,
-                1372,
-                1373,
-                1374,
-                1375,
-                1376,
-                1377,
-                1378,
-                1379,
-                1380,
-                1381,
-                1382,
-                1383,
-                1384,
-                1385,
-                1386,
-                1387,
-                1388,
-                1389,
-                1390,
-                1391,
-                1392,
-                1393,
-                1394,
-                1395,
-                1396,
-                1397,
-                1398,
-                1399,
-                1400,
-                1401,
-                1402,
-                1403,
-                1404,
-                1405,
-                1406,
-                1407,
-                1408,
-                1409,
-                1410,
-                1411,
-                1412,
-                1413,
-                1414,
-                1415,
-                1417,
-                1418,
-                1419,
-                1420,
-                1421,
-                1422,
-                1423,
-                1424,
-                1425,
-                1426,
-                1427,
-                1428,
-                1429,
-                1430,
-                1431,
-                1432,
-                1433,
-                1434,
-                1435,
-                1436,
-                1437,
-                1438,
-                1439,
-                1440,
-                1441,
-                1442,
-                1443,
-                1444,
-                1445,
-                1446,
-                1447,
-                1448,
-                1449,
-                1450,
-                1451,
-                1452,
-                1453,
-                1454,
-                1455,
-                1456,
-                1457,
-                1458,
-                1459,
-                1460,
-                1461,
-                1462,
-                1463,
-                1464,
-                1465,
-                1466,
-                1467,
-                1468,
-                1469,
-                1470,
-                1471,
-                1472,
-                1473,
-                1474,
-                1475,
-                1476,
-                1477,
-                1478,
-                1479,
-                1480,
-                1481,
-                1482,
-                1483,
-                1484,
-                1485,
-                1486,
-                1487,
-                1488,
-                1489,
-                1490,
-                1491,
-                1492,
-                1493,
-                1494,
-                1495,
-                1496,
-                1497,
-                1498,
-                1499,
-                1500,
-                1501,
-                1502,
-                1503,
-                1504,
-                1505,
-                1506,
-                1507,
-                1508,
-                1509,
-                1510,
-                1511,
-                1512,
-                1513,
-                1514,
-                1515,
-                1516,
-                1517,
-                1518,
-                1519,
-                1520,
-                1521,
-                1522,
-                1523,
-                1524,
-                1525,
-                1526,
-                1527,
-                1528,
-                1529,
-                1530,
-                1531,
-                1532,
-                1533,
-                1534,
-                1535,
-                1536,
-                1537,
-                1538,
-                1539,
-                1540,
-                1541,
-                1542,
-                1543,
-                1544,
-                1545,
-                1546,
-                1547,
-                1548,
-                1549,
-                1550,
-                1551,
-                1552,
-                1553,
-                1554,
-                1555,
-                1556,
-                1557,
-                1558,
-                1559,
-                1560,
-                1561,
-                1562,
-                1563,
-                1564,
-                1565,
-                1566,
-                1567,
-                1568,
-                1569,
-                1570,
-                1571,
-                1572,
-                1573,
-                1574,
-                1575,
-                1576,
-                1577,
-                1578,
-                1579,
-                1580,
-                1581,
-                1582,
-                1583,
-                1584,
-                1585,
-                1586,
-                1587,
-                1588,
-                1589,
-                1590,
-                1591,
-                1592,
-                1593,
-                1594,
-                1595,
-                1596,
-                1597,
-                1598,
-                1599,
-                1600,
-                1601,
-                1602,
-                1603,
-                1604,
-                1605,
-                1606,
-                1607,
-                1608,
-                1609,
-                1610,
-                1611,
-                1612,
-                1613,
-                1614,
-                1615,
-                1616,
-                1617,
-                1618,
-                1619,
-                1620,
-                1621,
-                1622,
-                1623,
-                1624,
-                1625,
-                1626,
-                1627,
-                1628,
-                1629,
-                1630,
-                1631,
-                1632,
-                1633,
-                1634,
-                1635,
-                1636,
-                1637,
-                1638,
-                1639,
-                1640,
-                1641,
-                1642,
-                1643,
-                1644,
-                1645,
-                1646,
-                1647,
-                1648,
-                1649,
-                1650,
-                1651,
-                1652,
-                1653,
-                1654,
-                1655,
-                1656,
-                1657,
-                1658,
-                1659,
-                1660,
-                1661,
-                1662,
-                1663,
-                1664,
-                1665,
-                1666,
-                1667,
-                1668,
-                1669,
-                1670,
-                1671,
-                1672,
-                1673,
-                1674,
-                1675,
-                1676,
-                1677,
-                1678,
-                1679,
-                1680,
-                1681,
-                1682,
-                1683,
-                1684,
-                1685,
-                1686,
-                1687,
-                1688,
-                1689,
-                1690,
-                1691,
-                1692,
-                1693,
-                1694,
-                1695,
-                1696,
-                1697,
-                1698,
-                1699,
-                1700,
-                1701,
-                1702,
-                1703,
-                1704,
-                1705,
-                1706,
-                1707,
-                1708,
-                1709,
-                1710,
-                1711,
-                1712,
-                1713,
-                1714,
-                1715,
-                1716,
-                1717,
-                1718,
-                1719,
-                1720,
-                1721,
-                1722,
-                1723,
-                1724,
-                1725,
-                1726,
-                1727,
-                1728,
-                1729,
-                1730,
-                1731,
-                1732,
-                1733,
-                1734,
-                1735,
-                1736,
-                1737,
-                1738,
-                1739,
-                1740,
-                1741,
-                1742,
-                1743,
-                1744,
-                1745,
-                1746,
-                1747,
-                1748,
-                1749,
-                1750,
-                1751,
-                1752,
-                1753,
-                1754,
-                1755,
-                1756,
-                1757,
-                1758,
-                1759,
-                1760,
-                1761,
-                1762,
-                1763,
-                1764,
-                1765,
-                1766,
-                1767,
-                1768,
-                1769,
-                1770,
-                1771,
-                1772,
-                1773,
-                1774,
-                1775,
-                1776,
-                1777,
-                1778,
-                1779,
-                1780,
-                1781,
-                1782,
-                1783,
-                1784,
-                1785,
-                1786,
-                1787,
-                1788,
-                1789,
-                1790,
-                1791,
-                1792,
-                1793,
-                1794,
-                1795,
-                1796,
-                1797,
-                1798,
-                1799,
-                1800,
-                1801,
-                1802,
-                1803,
-                1804,
-                1805,
-                1806,
-                1807,
-                1808,
-                1809,
-                1810,
-                1811,
-                1812,
-                1813,
-                1814,
-                1815,
-                1816,
-                1817,
-                1818,
-                1819,
-                1820,
-                1821,
-                1822,
-                1823,
-                1824,
-                1825,
-                1826,
-                1827,
-                1828,
-                1829,
-                1830,
-                1831,
-                1832,
-                1833,
-                1834,
-                1835,
-                1836,
-                1837,
-                1838,
-                1839,
-                1840,
-                1841,
-                1842,
-                1843,
-                1844,
-                1845,
-                1846,
-                1847,
-                1848,
-                1849,
-                1850,
-                1851,
-                1852,
-                1853,
-                1854,
-                1855,
-                1856,
-                1857,
-                1858,
-                1859,
-                1860,
-                1861,
-                1862,
-                1863,
-                1864,
-                1865,
-                1866,
-                1867,
-                1868,
-                1869,
-                1870,
-                1871,
-                1872,
-                1873,
-                1874,
-                1875,
-                1876,
-                1877,
-                1878,
-                1879,
-                1880,
-                1881,
-                1882,
-                1883,
-                1884,
-                1885,
-                1886,
-                1887,
-                1888,
-                1889,
-                1890,
-                1891,
-                1892,
-                1893,
-                1894,
-                1895,
-                1896,
-                1897,
-                1898,
-                1899,
-                1900,
-                1901,
-                1902,
-                1903,
-                1904,
-                1905,
-                1906,
-                1907,
-                1908,
-                1909,
-                1910,
-                1911,
-                1912,
-                1913,
-                1914,
-                1915,
-                1916,
-                1917,
-                1918,
-                1919,
-                1920,
-                1921,
-                1922,
-                1923,
-                1924,
-                1925,
-                1926,
-                1927,
-                1928,
-                1929,
-                1930,
-                1931,
-                1932,
-                1933,
-                1934,
-                1935,
-                1936,
-                1937,
-                1938,
-                1939,
-                1940,
-                1941,
-                1942,
-                1943,
-                1944,
-                1945,
-                1946,
-                1947,
-                1948,
-                1949,
-                1950,
-                1951,
-                1952,
-                1953,
-                1954,
-                1955,
-                1956,
-                1957,
-                1958,
-                1959,
-                1960,
-                1961,
-                1962,
-                1963,
-                1964,
-                1965,
-                1966,
-                1967,
-                1968,
-                1969,
-                1970,
-                1971,
-                1972,
-                1973,
-                1974,
-                1975,
-                1976,
-                1977,
-                1978,
-                1979,
-                1980,
-                1981,
-                1982,
-                1983,
-                1984,
-                1985,
-                1986,
-                1987,
-                1988,
-                1989,
-                1990,
-                1991,
-                1992,
-                1993,
-                1994,
-                1995,
-                1996,
-                1997,
-                1998,
-                1999,
-                2000,
-                2001,
-                2002,
-                2003,
-                2004,
-                2005,
-                2006,
-                2007,
-                2008,
-                2009,
-                2010,
-                2011,
-                2012,
-                2013,
-                2014,
-                2015,
-                2016,
-                2017,
-                2018,
-                2019,
-                2020,
-                2021,
-                2022,
-                2023,
-                2024,
-                2025,
-                2026,
-                2027,
-                2028,
-                2029,
-                2030,
-                2031,
-                2032,
-                2033,
-                2034,
-                2035,
-                2036,
-                2037,
-                2038,
-                2039,
-                2040,
-                2041,
-                2042,
-                2043,
-                2044,
-                2045,
-                2046,
-                2047,
-                2048,
-                2049,
-                2050,
-                2051,
-                2052,
-                2053,
-                2054,
-                2055,
-                2056,
-                2057,
-                2058,
-                2059,
-                2060,
-                2061,
-                2062,
-                2063,
-                2064,
-                2065,
-                2066,
-                2067,
-                2068,
-                2069,
-                2070,
-                2071,
-                2072,
-                2073,
-                2074,
-                2075,
-                2076,
-                2077,
-                2078,
-                2079,
-                2080,
-                2081,
-                2082,
-                2083,
-                2084,
-                2085,
-                2086,
-                2087,
-                2088,
-                2089,
-                2090,
-                2091,
-                2092,
-                2093,
-                2094,
-                2095,
-                2096,
-                2097,
-                2098,
-                2099,
-                2100,
-                2101,
-                2102,
-                2103,
-                2104,
-                2105,
-                2106,
-                2107,
-                2108,
-                2109,
-                2110,
-                2111,
-                2112,
-                2113,
-                2114,
-                2115,
-                2116,
-                2117,
-                2118,
-                2119,
-                2120,
-                2121,
-                2122,
-                2123,
-                2124,
-                2125,
-                2126,
-                2127,
-                2128,
-                2129,
-                2130,
-                2131,
-                2132,
-                2133,
-                2134,
-                2135,
-                2136,
-                2137,
-                2138,
-                2139,
-                2140,
-                2141,
-                2142,
-                2143,
-                2144,
-                2145,
-                2146,
-                2147,
-                2148,
-                2149,
-                2150,
-                2151,
-                2152,
-                2153,
-                2154,
-                2155,
-                2156,
-                2157,
-                2158,
-                2159,
-                2160,
-                2161,
-                2162,
-                2163,
-                2164,
-                2165,
-                2166,
-                2167,
-                2168,
-                2169,
-                2170,
-                2171,
-                2172,
-                2173,
-                2174,
-                2175,
-                2176,
-                2177,
-                2178,
-                2179,
-                2180,
-                2181,
-                2182,
-                2183,
-                2184,
-                2185,
-                2186,
-                2187,
-                2188,
-                2189,
-                2190,
-                2191,
-                2192,
-                2193,
-                2194,
-                2195,
-                2196,
-                2197,
-                2198,
-                2199,
-                2200,
-                2201,
-                2202,
-                2203,
-                2204,
-                2205,
-                2206,
-                2207,
-                2208,
-                2209,
-                2210,
-                2211,
-                2212,
-                2213,
-                2214,
-                2215,
-                2216,
-                2217,
-                2218,
-                2219,
-                2220,
-                2221,
-                2222,
-                2223,
-                2224,
-                2225,
-                2226,
-                2227,
-                2228,
-                2229,
-                2230,
-                2231,
-                2232,
-                2233,
-                2234,
-                2235,
-                2236,
-                2237,
-                2238,
-                2239,
-                2240,
-                2241,
-                2242,
-                2243,
-                2244,
-                2245,
-                2246,
-                2247,
-                2248,
-                2249,
-                2250,
-                2251,
-                2252,
-                2253,
-                2254,
-                2255,
-                2256,
-                2257,
-                2258,
-                2259,
-                2260,
-                2261,
-                2262,
-                2263,
-                2264,
-                2265,
-                2266,
-                2267,
-                2268,
-                2269,
-                2270,
-                2271,
-                2272,
-                2273,
-                2274,
-                2275,
-                2276,
-                2277,
-                2278,
-                2279,
-                2280,
-                2281,
-                2282,
-                2283,
-                2284,
-                2285,
-                2286,
-                2287,
-                2288,
-                2289,
-                2290,
-                2291,
-                2292,
-                2293,
-                2294,
-                2295,
-                2296,
-                2297,
-                2298,
-                2299,
-                2300,
-                2301,
-                2302,
-                2303,
-                2304,
-                2305,
-                2306,
-                2307,
-                2308,
-                2309,
-                2310,
-                2311,
-                2312,
-                2313,
-                2314,
-                2315,
-                2316,
-                2317,
-                2318,
-                2319,
-                2320,
-                2321,
-                2322,
-                2323,
-                2324,
-                2325,
-                2326,
-                2327,
-                2328,
-                2329,
-                2330,
-                2331,
-                2332,
-                2333,
-                2334,
-                2335,
-                2336,
-                2337,
-                2338,
-                2339,
-                2340,
-                2341,
-                2342,
-                2343,
-                2344,
-                2345,
-                2346,
-                2347,
-                2348,
-                2349,
-                2350,
-                2351,
-                2352,
-                2353,
-                2354,
-                2355,
-                2356,
-                2357,
-                2358,
-                2359,
-                2360,
-                2361,
-                2362,
-                2363,
-                2364,
-                2365,
-                2366,
-                2367,
-                2368,
-                2369,
-                2370,
-                2371,
-                2372,
-                2373,
-                2374,
-                2375,
-                2376,
-                2377,
-                2378,
-                2379,
-                2380,
-                2381,
-                2382,
-                2383,
-                2384,
-                2385,
-                2386,
-                2387,
-                2388,
-                2389,
-                2390,
-                2391,
-                2392,
-                2393,
-                2394,
-                2395,
-                2396,
-                2397,
-                2398,
-                2399,
-                2400,
-                2401,
-                2402,
-                2403,
-                2404,
-                2405,
-                2406,
-                2407,
-                2408,
-                2409,
-                2410,
-                2411,
-                2412,
-                2413,
-                2414,
-                2415,
-                2416,
-                2417,
-                2418,
-                2419,
-                2420,
-                2421,
-                2422,
-                2423,
-                2424,
-                2425,
-                2426,
-                2427,
-                2428,
-                2429,
-                2430,
-                2431,
-                2432,
-                2433,
-                2434,
-                2435,
-                2436,
-                2437,
-                2438,
-                2439,
-                2440,
-                2441,
-                2442,
-                2443,
-                2444,
-                2445,
-                2446,
-                2447,
-                2448,
-                2449,
-                2450,
-                2451,
-                2452,
-                2453,
-                2454,
-                2455,
-                2456,
-                2457,
-                2458,
-                2459,
-                2460,
-                2461,
-                2462,
-                2463,
-                2464,
-                2465,
-                2466,
-                2467,
-                2468,
-                2469,
-                2470,
-                2471,
-                2472,
-                2473,
-                2474,
-                2475,
-                2476,
-                2477,
-                2478,
-                2479,
-                2480,
-                2481,
-                2482,
-                2483,
-                2484,
-                2485,
-                2486,
-                2487,
-                2488,
-                2489,
-                2490,
-                2491,
-                2492,
-                2493,
-                2494,
-                2495,
-                2496,
-                2497,
-                2498,
-                2499,
-                2500,
-                2501,
-                2502,
-                2503,
-                2504,
-                2505,
-                2506,
-                2507,
-                2508,
-                2509,
-                2510,
-                2511,
-                2512,
-                2513,
-                2514,
-                2515,
-                2516,
-                2517,
-                2518,
-                2519,
-                2520,
-                2521,
-                2522,
-                2523,
-                2524,
-                2525,
-                2526,
-                2527,
-                2528,
-                2529,
-                2530,
-                2531,
-                2532,
-                2533,
-                2534,
-                2535,
-                2536,
-                2537,
-                2538,
-                2539,
-                2540,
-                2541,
-                2542,
-                2543,
-                2544,
-                2545,
-                2546,
-                2547,
-                2548,
-                2549,
-                2550,
-                2551,
-                2552,
-                2553,
-                2554,
-                2555,
-                2556,
-                2557,
-                2558,
-                2559,
-                2560,
-                2561,
-                2562,
-                2563,
-                2564,
-                2565,
-                2566,
-                2567,
-                2568,
-                2569,
-                2570,
-                2571,
-                2572,
-                2573,
-                2574,
-                2575,
-                2576,
-                2577,
-                2578,
-                2579,
-                2580,
-                2581,
-                2582,
-                2583,
-                2584,
-                2585,
-                2586,
-                2587,
-                2588,
-                2589,
-                2590,
-                2591,
-                2592,
-                2593,
-                2594,
-                2595,
-                2596,
-                2597,
-                2598,
-                2599,
-                2600,
-                2601,
-                2602,
-                2603,
-                2604,
-                2605,
-                2606,
-                2607,
-                2608,
-                2609,
-                2610,
-                2611,
-                2612,
-                2613,
-                2614,
-                2615,
-                2616,
-                2617,
-                2618,
-                2619,
-                2620,
-                2621,
-                2622,
-                2623,
-                2624,
-                2625,
-                2626,
-                2627,
-                2628,
-                2629,
-                2630,
-                2631,
-                2632,
-                2633,
-                2634,
-                2635,
-                2636,
-                2637,
-                2638,
-                2639,
-                2640,
-                2641,
-                2642,
-                2643,
-                2644,
-                2645,
-                2646,
-                2647,
-                2648,
-                2649,
-                2650,
-                2651,
-                2652,
-                2653,
-                2654,
-                2655,
-                2656,
-                2657,
-                2658,
-                2659,
-                2660,
-                2661,
-                2662,
-                2663,
-                2664,
-                2665,
-                2666,
-                2667,
-                2668,
-                2669,
-                2670,
-                2671,
-                2672,
-                2673,
-                2674,
-                2675,
-                2676,
-                2677,
-                2678,
-                2679,
-                2680,
-                2681,
-                2682,
-                2683,
-                2684,
-                2685,
-                2686,
-                2687,
-                2688,
-                2689,
-                2690,
-                2691,
-                2692,
-                2693,
-                2694,
-                2695,
-                2696,
-                2697,
-                2698,
-                2699,
-                2700,
-                2701,
-                2702,
-                2703,
-                2704,
-                2705,
-                2706,
-                2707,
-                2708,
-                2709,
-                2710,
-                2711,
-                2712,
-                2713,
-                2714,
-                2715,
-                2716,
-                2717,
-                2718,
-                2719,
-                2720,
-                2721,
-                2722,
-                2723,
-                2724,
-                2725,
-                2726,
-                2727,
-                2728,
-                2729,
-                2730,
-                2731,
-                2732,
-                2733,
-                2734,
-                2735,
-                2736,
-                2737,
-                2738,
-                2739,
-                2740,
-                2741,
-                2742,
-                2743,
-                2744,
-                2745,
-                2746,
-                2747,
-                2748,
-                2749,
-                2750,
-                2751,
-                2752,
-                2753,
-                2754,
-                2755,
-                2756,
-                2757,
-                2758,
-                2759,
-                2760,
-                2761,
-                2762,
-                2763,
-                2764,
-                2765,
-                2766,
-                2767,
-                2768,
-                2769,
-                2770,
-                2771,
-                2772,
-                2773,
-                2774,
-                2775,
-                2776,
-                2777,
-                2778,
-                2779,
-                2780,
-                2781,
-                2782,
-                2783,
-                2784,
-                2785,
-                2786,
-                2787,
-                2788,
-                2789,
-                2790,
-                2791,
-                2792,
-                2793,
-                2794,
-                2795,
-                2796,
-                2797,
-                2798,
-                2799,
-                2800,
-                2801,
-                2802,
-                2803,
-                2804,
-                2805,
-                2806,
-                2807,
-                2808,
-                2809,
-                2810,
-                2811,
-                2812,
-                2813,
-                2814,
-                2815,
-                2816,
-                2817,
-                2818,
-                2819,
-                2820,
-                2821,
-                2822,
-                2823,
-                2824,
-                2825,
-                2826,
-                2827,
-                2828,
-                2829,
-                2830,
-                2831,
-                2832,
-                2833,
-                2834,
-                2835,
-                2836,
-                2837,
-                2838,
-                2839,
-                2840,
-                2841,
-                2842,
-                2843,
-                2844,
-                2845,
-                2846,
-                2847,
-                2848,
-                2849,
-                2850,
-                2851,
-                2852,
-                2853,
-                2854,
-                2855,
-                2856,
-                2857,
-                2858,
-                2859,
-                2860,
-                2861,
-                2862,
-                2863,
-                2864,
-                2865,
-                2866,
-                2867,
-                2868,
-                2869,
-                2870,
-                2871,
-                2872,
-                2873,
-                2874,
-                2875,
-                2876,
-                2877,
-                2878,
-                2879,
-                2880,
-                2881,
-                2882,
-                2883,
-                2884,
-                2885,
-                2886,
-                2887,
-                2888,
-                2889,
-                2890,
-                2891,
-                2892,
-                2893,
-                2894,
-                2895,
-                2896,
-                2897,
-                2898,
-                2899,
-                2900,
-                2901,
-                2902,
-                2903,
-                2904,
-                2905,
-                2906,
-                2907,
-                2908,
-                2909,
-                2910,
-                2911,
-                2912,
-                2913,
-                2914,
-                2915,
-                2916,
-                2917,
-                2918,
-                2919,
-                2920,
-                2921,
-                2922,
-                2923,
-                2924,
-                2925,
-                2926,
-                2927,
-                2928,
-                2929,
-                2930,
-                2931,
-                2932,
-                2933,
-                2934,
-                2935,
-                2936,
-                2937,
-                2938,
-                2939,
-                2940,
-                2941,
-                2942,
-                2943,
-                2944,
-                2945,
-                2946,
-                2947,
-                2948,
-                2949,
-                2950,
-                2951,
-                2952,
-                2953,
-                2954,
-                2955,
-                2956,
-                2957,
-                2958,
-                2959,
-                2960,
-                2961,
-                2962,
-                2963,
-                2964,
-                2965,
-                2966,
-                2967,
-                2968,
-                2969,
-                2970,
-                2971,
-                2972,
-                2973,
-                2974,
-                2975,
-                2976,
-                2977,
-                2978,
-                2979,
-                2980,
-                2981,
-                2982,
-                2983,
-                2984,
-                2985,
-                2986,
-                2987,
-                2988,
-                2989,
-                2990,
-                2991,
-                2992,
-                2993,
-                2994,
-                2995,
-                2996,
-                2997,
-                2998,
-                2999,
-                3000,
-                3001,
-                3002,
-                3003,
-                3004,
-                3005,
-                3006,
-                3007,
-                3008,
-                3009,
-                3010,
-                3011,
-                3012,
-                3013,
-                3014,
-                3015,
-                3016,
-                3017,
-                3018,
-                3019,
-                3020,
-                3021,
-                3022,
-                3023,
-                3024,
-                3025,
-                3026,
-                3027,
-                3028,
-                3029,
-                3030,
-                3031,
-                3032,
-                3033,
-                3034,
-                3035,
-                3036,
-                3037,
-                3038,
-                3039,
-                3040,
-                3041,
-                3042,
-                3043,
-                3044,
-                3045,
-                3046,
-                3047,
-                3048,
-                3049,
-                3050,
-                3051,
-                3052,
-                3053,
-                3054,
-                3055,
-                3056,
-                3057,
-                3058,
-                3059,
-                3060,
-                3061,
-                3062,
-                3063,
-                3064,
-                3065,
-                3066,
-                3067,
-                3068,
-                3069,
-                3070,
-                3071,
-                3072,
-                3073,
-                3074,
-                3075,
-                3076,
-                3077,
-                3078,
-                3079,
-                3080,
-                3081,
-                3082,
-                3083,
-                3084,
-                3085,
-                3086,
-                3087,
-                3088,
-                3089,
-                3090,
-                3091,
-                3092,
-                3093,
-                3094,
-                3095,
-                3096,
-                3097,
-                3098,
-                3099,
-                3100,
-                3101,
-                3102,
-                3103,
-                3104,
-                3105,
-                3106,
-                3107,
-                3108,
-                3109,
-                3110,
-                3111,
-                3112,
-                3113,
-                3114,
-                3115,
-                3116,
-                3117,
-                3118,
-                3119,
-                3120,
-                3121,
-                3122,
-                3123,
-                3124,
-                3125,
-                3126,
-                3127,
-                3128,
-                3129,
-                3130,
-                3131,
-                3132,
-                3133,
-                3134,
-                3135,
-                3136,
-                3137,
-                3138,
-                3139,
-                3140,
-                3141,
-                3142,
-                3143,
-                3144,
-                3145,
-                3146,
-                3147,
-                3148,
-                3149,
-                3150,
-                3151,
-                3152,
-                3153,
-                3154,
-                3155,
-                3156,
-                3157,
-                3158,
-                3159,
-                3160,
-                3161,
-                3162,
-                3163,
-                3164,
-                3165,
-                3166,
-                3167,
-                3168,
-                3169,
-                3170,
-                3171,
-                3172,
-                3173,
-                3174,
-                3175,
-                3176,
-                3177,
-                3178,
-                3179,
-                3180,
-                3181,
-                3182,
-                3183,
-                3184,
-                3185,
-                3186,
-                3187,
-                3188,
-                3189,
-                3190,
-                3191,
-                3192,
-                3193,
-                3194,
-                3195,
-                3196,
-                3197,
-                3198,
-                3199,
-                3200,
-                3201,
-                3202,
-                3203,
-                3204,
-                3205,
-                3206,
-                3207,
-                3208,
-                3209,
-                3210,
-                3211,
-                3212,
-                3213,
-                3214,
-                3215,
-                3216,
-                3217,
-                3218,
-                3219,
-                3220,
-                3221,
-                3222,
-                3223,
-                3224,
-                3225,
-                3226,
-                3227,
-                3228,
-                3229,
-                3230,
-                3231,
-                3232,
-                3233,
-                3234,
-                3235,
-                3236,
-                3237,
-                3238,
-                3239,
-                3240,
-                3241,
-                3242,
-                3243,
-                3244,
-                3245,
-                3246,
-                3247,
-                3248,
-                3249,
-                3250,
-                3251,
-                3252,
-                3253,
-                3254,
-                3255,
-                3256,
-                3257,
-                3258,
-                3259,
-                3260,
-                3261,
-                3262,
-                3263,
-                3264,
-                3265,
-                3266,
-                3267,
-                3268,
-                3269,
-                3270,
-                3271,
-                3272,
-                3273,
-                3274,
-                3275,
-                3276,
-                3277,
-                3278,
-                3279,
-                3281,
-                3282,
-                3283,
-                3284,
-                3285,
-                3286,
-                3287,
-                3288,
-                3289,
-                3290,
-                3291,
-                3292,
-                3293,
-                3294,
-                3295,
-                3296,
-                3297,
-                3298,
-                3299,
-                3300,
-                3301,
-                3302,
-                3303,
-                3304,
-                3305,
-                3306,
-                3307,
-                3308,
-                3309,
-                3310,
-                3311,
-                3312,
-                3313,
-                3314,
-                3315,
-                3316,
-                3317,
-                3318,
-                3319,
-                3320,
-                3321,
-                3322,
-                3323,
-                3324,
-                3325,
-                3326,
-                3327,
-                3328,
-                3329,
-                3330,
-                3331,
-                3332,
-                3333,
-                3334,
-                3335,
-                3336,
-                3337,
-                3338,
-                3339,
-                3340,
-                3341,
-                3342,
-                3343,
-                3344,
-                3345,
-                3346,
-                3347,
-                3348,
-                3349,
-                3350,
-                3351,
-                3352,
-                3353,
-                3354,
-                3355,
-                3356,
-                3357,
-                3358,
-                3359,
-                3360,
-                3361,
-                3362,
-                3363,
-                3364,
-                3365,
-                3366,
-                3367,
-                3368,
-                3369,
-                3370,
-                3371,
-                3372,
-                3373,
-                3374,
-                3375,
-                3376,
-                3377,
-                3378,
-                3379,
-                3380,
-                3381,
-                3382,
-                3383,
-                3384,
-                3385,
-                3386,
-                3387,
-                3388,
-                3389,
-                3390,
-                3391,
-                3392,
-                3393,
-                3394,
-                3395,
-                3396,
-                3397,
-                3398,
-                3399,
-                3400,
-                3401,
-                3402,
-                3403,
-                3404,
-                3405,
-                3406,
-                3407,
-                3408,
-                3409,
-                3410,
-                3411,
-                3412,
-                3413,
-                3414,
-                3415,
-                3416,
-                3417,
-                3418,
-                3419,
-                3420,
-                3421,
-                3422,
-                3423,
-                3424,
-                3425,
-                3426,
-                3427,
-                3428,
-                3429,
-                3430,
-                3431,
-                3432,
-                3433,
-                3434,
-                3435,
-                3436,
-                3437,
-                3438,
-                3439,
-                3440,
-                3441,
-                3442,
-                3443,
-                3444,
-                3445,
-                3446,
-                3447,
-                3448,
-                3449,
-                3450,
-                3451,
-                3452,
-                3453,
-                3454,
-                3455,
-                3456,
-                3457,
-                3458,
-                3459,
-                3460,
-                3461,
-                3462,
-                3463,
-                3464,
-                3465,
-                3466,
-                3467,
-                3468,
-                3469,
-                3470,
-                3471,
-                3472,
-                3473
+                8000,
+                9000,
+                10000,
+                11000,
+                12000,
+                13000,
+                14000,
+                15000,
+                16000,
+                17000,
+                18000,
+                19000,
+                20000,
+                21000,
+                22000,
+                23000,
+                24000,
+                25000,
+                26000,
+                27000,
+                28000,
+                29000,
+                30000,
+                31000,
+                32000,
+                33000,
+                34000,
+                35000,
+                36000,
+                37000,
+                38000,
+                39000,
+                40000,
+                41000,
+                42000,
+                43000,
+                44000,
+                45000,
+                46000,
+                47000,
+                48000,
+                49000,
+                50000,
+                51000,
+                52000,
+                53000,
+                54000,
+                55000,
+                56000,
+                57000,
+                58000,
+                59000,
+                60000,
+                61000,
+                62000,
+                63000,
+                64000,
+                65000,
+                66000,
+                67000,
+                68000,
+                69000,
+                70000,
+                71000,
+                72000,
+                73000,
+                74000,
+                75000,
+                76000,
+                77000,
+                78000,
+                79000,
+                80000,
+                81000,
+                82000,
+                83000,
+                84000,
+                85000,
+                86000,
+                87000,
+                88000,
+                89000,
+                90000,
+                91000,
+                92000,
+                93000,
+                94000,
+                95000,
+                96000,
+                97000,
+                98000,
+                99000,
+                100000,
+                101000,
+                102000,
+                103000,
+                104000,
+                105000,
+                106000,
+                107000,
+                108000,
+                109000,
+                110000,
+                111000,
+                112000,
+                113000,
+                114000,
+                115000,
+                116000,
+                117000,
+                118000,
+                119000,
+                120000,
+                121000,
+                122000,
+                123000,
+                124000,
+                125000,
+                126000,
+                127000,
+                128000,
+                129000,
+                130000,
+                131000,
+                132000,
+                133000,
+                134000,
+                135000,
+                136000,
+                137000,
+                138000,
+                139000,
+                140000,
+                141000,
+                142000,
+                143000,
+                144000,
+                145000,
+                146000,
+                147000,
+                148000,
+                149000,
+                150000,
+                151000,
+                152000,
+                153000,
+                154000,
+                155000,
+                156000,
+                157000,
+                158000,
+                159000,
+                160000,
+                161000,
+                162000,
+                163000,
+                164000,
+                165000,
+                166000,
+                167000,
+                168000,
+                169000,
+                170000,
+                171000,
+                172000,
+                173000,
+                174000,
+                175000,
+                176000,
+                177000,
+                178000,
+                179000,
+                180000,
+                181000,
+                182000,
+                183000,
+                184000,
+                185000,
+                186000,
+                187000,
+                188000,
+                189000,
+                190000,
+                191000,
+                192000,
+                193000,
+                194000,
+                195000,
+                196000,
+                197000,
+                198000,
+                199000,
+                200000,
+                201000,
+                202000,
+                203000,
+                204000,
+                205000,
+                206000,
+                207000,
+                208000,
+                209000,
+                210000,
+                211000,
+                212000,
+                213000,
+                214000,
+                215000,
+                216000,
+                217000,
+                218000,
+                219000,
+                220000,
+                221000,
+                222000,
+                223000,
+                224000,
+                225000,
+                226000,
+                227000,
+                228000,
+                229000,
+                230000,
+                231000,
+                232000,
+                233000,
+                234000,
+                235000,
+                236000,
+                237000,
+                238000,
+                239000,
+                240000,
+                241000,
+                242000,
+                243000,
+                244000,
+                245000,
+                246000,
+                247000,
+                248000,
+                249000,
+                250000,
+                251000,
+                252000,
+                253000,
+                254000,
+                255000,
+                256000,
+                257000,
+                258000,
+                259000,
+                260000,
+                261000,
+                262000,
+                263000,
+                264000,
+                265000,
+                266000,
+                267000,
+                268000,
+                269000,
+                270000,
+                271000,
+                272000,
+                273000,
+                274000,
+                275000,
+                276000,
+                277000,
+                278000,
+                279000,
+                280000,
+                281000,
+                282000,
+                283000,
+                284000,
+                285000,
+                286000,
+                287000,
+                288000,
+                289000,
+                290000,
+                291000,
+                292000,
+                293000,
+                294000,
+                295000,
+                296000,
+                297000,
+                298000,
+                299000,
+                300000,
+                301000,
+                302000,
+                303000,
+                304000,
+                305000,
+                306000,
+                307000,
+                308000,
+                309000,
+                310000,
+                311000,
+                312000,
+                313000,
+                314000,
+                315000,
+                316000,
+                317000,
+                318000,
+                319000,
+                320000,
+                321000,
+                322000,
+                323000,
+                324000,
+                325000,
+                326000,
+                327000,
+                328000,
+                329000,
+                330000,
+                331000,
+                332000,
+                333000,
+                334000,
+                335000,
+                336000,
+                337000,
+                338000,
+                339000,
+                340000,
+                341000,
+                342000,
+                343000,
+                344000,
+                345000,
+                346000,
+                347000,
+                348000,
+                349000,
+                350000,
+                351000,
+                352000,
+                353000,
+                354000,
+                355000,
+                356000,
+                357000,
+                358000,
+                359000,
+                360000,
+                361000,
+                362000,
+                363000,
+                364000,
+                365000,
+                366000,
+                367000,
+                368000,
+                369000,
+                370000,
+                371000,
+                372000,
+                373000,
+                374000,
+                375000,
+                376000,
+                377000,
+                378000,
+                379000,
+                380000,
+                381000,
+                382000,
+                383000,
+                384000,
+                385000,
+                386000,
+                387000,
+                388000,
+                389000,
+                390000,
+                391000,
+                392000,
+                393000,
+                394000,
+                395000,
+                396000,
+                397000,
+                398000,
+                399000,
+                400000,
+                401000,
+                402000,
+                403000,
+                404000,
+                405000,
+                406000,
+                407000,
+                408000,
+                409000,
+                410000,
+                411000,
+                412000,
+                413000,
+                414000,
+                415000,
+                416000,
+                417000,
+                418000,
+                419000,
+                420000,
+                421000,
+                422000,
+                423000,
+                424000,
+                425000,
+                426000,
+                427000,
+                428000,
+                429000,
+                430000,
+                431000,
+                432000,
+                433000,
+                434000,
+                435000,
+                436000,
+                437000,
+                438000,
+                439000,
+                440000,
+                441000,
+                442000,
+                443000,
+                444000,
+                445000,
+                446000,
+                447000,
+                448000,
+                449000,
+                450000,
+                451000,
+                452000,
+                453000,
+                454000,
+                455000,
+                456000,
+                457000,
+                458000,
+                459000,
+                460000,
+                461000,
+                462000,
+                463000,
+                464000,
+                465000,
+                466000,
+                467000,
+                468000,
+                469000,
+                470000,
+                471000,
+                472000,
+                473000,
+                474000,
+                475000,
+                476000,
+                477000,
+                478000,
+                479000,
+                480000,
+                481000,
+                482000,
+                483000,
+                484000,
+                485000,
+                486000,
+                487000,
+                488000,
+                489000,
+                490000,
+                491000,
+                492000,
+                493000,
+                494000,
+                495000,
+                496000,
+                497000,
+                498000,
+                499000,
+                500000,
+                501000,
+                502000,
+                503000,
+                504000,
+                505000,
+                506000,
+                507000,
+                508000,
+                509000,
+                510000,
+                511000,
+                512000,
+                513000,
+                514000,
+                515000,
+                516000,
+                517000,
+                518000,
+                519000,
+                520000,
+                521000,
+                522000,
+                523000,
+                524000,
+                525000,
+                526000,
+                527000,
+                528000,
+                529000,
+                530000,
+                531000,
+                532000,
+                533000,
+                534000,
+                535000,
+                536000,
+                537000,
+                538000,
+                539000,
+                540000,
+                541000,
+                542000,
+                543000,
+                544000,
+                545000,
+                546000,
+                547000,
+                548000,
+                549000,
+                550000,
+                551000,
+                552000,
+                553000,
+                554000,
+                555000,
+                556000,
+                557000,
+                558000,
+                559000,
+                560000,
+                561000,
+                562000,
+                563000,
+                564000,
+                565000,
+                566000,
+                567000,
+                568000,
+                569000,
+                570000,
+                571000,
+                572000,
+                573000,
+                574000,
+                575000,
+                576000,
+                577000,
+                578000,
+                579000,
+                580000,
+                581000,
+                582000,
+                583000,
+                584000,
+                585000,
+                586000,
+                587000,
+                588000,
+                589000,
+                590000,
+                591000,
+                592000,
+                593000,
+                594000,
+                595000,
+                596000,
+                597000,
+                598000,
+                599000,
+                600000,
+                601000,
+                602000,
+                603000,
+                604000,
+                605000,
+                606000,
+                607000,
+                608000,
+                609000,
+                610000,
+                611000,
+                612000,
+                613000,
+                614000,
+                615000,
+                616000,
+                617000,
+                618000,
+                619000,
+                620000,
+                621000,
+                622000,
+                623000,
+                624000,
+                625000,
+                626000,
+                627000,
+                628000,
+                629000,
+                630000,
+                631000,
+                632000,
+                633000,
+                634000,
+                635000,
+                636000,
+                637000,
+                638000,
+                639000,
+                640000,
+                641000,
+                642000,
+                643000,
+                644000,
+                645000,
+                646000,
+                647000,
+                648000,
+                649000,
+                650000,
+                651000,
+                652000,
+                653000,
+                654000,
+                655000,
+                656000,
+                657000,
+                658000,
+                659000,
+                660000,
+                661000,
+                662000,
+                663000,
+                664000,
+                665000,
+                666000,
+                667000,
+                668000,
+                669000,
+                670000,
+                671000,
+                672000,
+                673000,
+                674000,
+                675000,
+                676000,
+                677000,
+                678000,
+                679000,
+                680000,
+                681000,
+                682000,
+                683000,
+                684000,
+                685000,
+                686000,
+                687000,
+                688000,
+                689000,
+                690000,
+                691000,
+                692000,
+                693000,
+                694000,
+                695000,
+                696000,
+                697000,
+                698000,
+                699000,
+                700000,
+                701000,
+                702000,
+                703000,
+                704000,
+                705000,
+                706000,
+                707000,
+                708000,
+                709000,
+                710000,
+                711000,
+                712000,
+                713000,
+                714000,
+                715000,
+                716000,
+                717000,
+                718000,
+                719000,
+                720000,
+                721000,
+                722000,
+                723000,
+                724000,
+                725000,
+                726000,
+                727000,
+                728000,
+                729000,
+                730000,
+                731000,
+                732000,
+                733000,
+                734000,
+                735000,
+                736000,
+                737000,
+                738000,
+                739000,
+                740000,
+                741000,
+                742000,
+                743000,
+                744000,
+                745000,
+                746000,
+                747000,
+                748000,
+                749000,
+                750000,
+                751000,
+                752000,
+                753000,
+                754000,
+                755000,
+                756000,
+                757000,
+                758000,
+                759000,
+                760000,
+                761000,
+                762000,
+                763000,
+                764000,
+                765000,
+                766000,
+                767000,
+                768000,
+                769000,
+                770000,
+                771000,
+                772000,
+                773000,
+                774000,
+                775000,
+                776000,
+                777000,
+                778000,
+                779000,
+                780000,
+                781000,
+                782000,
+                783000,
+                784000,
+                785000,
+                786000,
+                787000,
+                788000,
+                789000,
+                790000,
+                791000,
+                792000,
+                793000,
+                794000,
+                795000,
+                796000,
+                797000,
+                798000,
+                799000,
+                800000,
+                801000,
+                802000,
+                803000,
+                804000,
+                805000,
+                806000,
+                807000,
+                808000,
+                809000,
+                810000,
+                811000,
+                812000,
+                813000,
+                814000,
+                815000,
+                816000,
+                817000,
+                818000,
+                819000,
+                820000,
+                821000,
+                822000,
+                823000,
+                824000,
+                825000,
+                826000,
+                827000,
+                828000,
+                829000,
+                830000,
+                831000,
+                832000,
+                833000,
+                834000,
+                835000,
+                836000,
+                837000,
+                838000,
+                839000,
+                840000,
+                841000,
+                842000,
+                843000,
+                844000,
+                845000,
+                846000,
+                847000,
+                848000,
+                849000,
+                850000,
+                851000,
+                852000,
+                853000,
+                854000,
+                855000,
+                856000,
+                857000,
+                858000,
+                859000,
+                860000,
+                861000,
+                862000,
+                863000,
+                864000,
+                865000,
+                866000,
+                867000,
+                868000,
+                869000,
+                870000,
+                871000,
+                872000,
+                873000,
+                874000,
+                875000,
+                876000,
+                877000,
+                878000,
+                879000,
+                880000,
+                881000,
+                882000,
+                883000,
+                884000,
+                885000,
+                886000,
+                887000,
+                888000,
+                889000,
+                890000,
+                891000,
+                892000,
+                893000,
+                894000,
+                895000,
+                896000,
+                897000,
+                898000,
+                899000,
+                900000,
+                901000,
+                902000,
+                903000,
+                904000,
+                905000,
+                906000,
+                907000,
+                908000,
+                909000,
+                910000,
+                911000,
+                912000,
+                913000,
+                914000,
+                915000,
+                916000,
+                917000,
+                918000,
+                919000,
+                920000,
+                921000,
+                922000,
+                923000,
+                924000,
+                925000,
+                926000,
+                927000,
+                928000,
+                929000,
+                930000,
+                931000,
+                932000,
+                933000,
+                934000,
+                935000,
+                936000,
+                937000,
+                938000,
+                939000,
+                940000,
+                941000,
+                942000,
+                943000,
+                944000,
+                945000,
+                946000,
+                947000,
+                948000,
+                949000,
+                950000,
+                951000,
+                952000,
+                953000,
+                954000,
+                955000,
+                956000,
+                957000,
+                958000,
+                959000,
+                960000,
+                961000,
+                962000,
+                963000,
+                964000,
+                965000,
+                966000,
+                967000,
+                968000,
+                969000,
+                970000,
+                971000,
+                972000,
+                973000,
+                974000,
+                975000,
+                976000,
+                977000,
+                978000,
+                979000,
+                980000,
+                981000,
+                982000,
+                983000,
+                984000,
+                985000,
+                986000,
+                987000,
+                988000,
+                989000,
+                990000,
+                991000,
+                992000,
+                993000,
+                994000,
+                995000,
+                996000,
+                997000,
+                998000,
+                999000,
+                1000000,
+                1001000,
+                1002000,
+                1003000,
+                1004000,
+                1005000,
+                1006000,
+                1007000,
+                1008000,
+                1009000,
+                1010000,
+                1011000,
+                1012000,
+                1013000,
+                1014000,
+                1015000,
+                1016000,
+                1017000,
+                1018000,
+                1019000,
+                1020000,
+                1021000,
+                1022000,
+                1023000,
+                1024000,
+                1025000,
+                1026000,
+                1027000,
+                1028000,
+                1029000,
+                1030000,
+                1031000,
+                1032000,
+                1033000,
+                1034000,
+                1035000,
+                1036000,
+                1037000,
+                1038000,
+                1039000,
+                1040000,
+                1041000,
+                1042000,
+                1043000,
+                1044000,
+                1045000,
+                1046000,
+                1047000,
+                1048000,
+                1049000,
+                1050000,
+                1051000,
+                1052000,
+                1053000,
+                1054000,
+                1055000,
+                1056000,
+                1057000,
+                1058000,
+                1059000,
+                1060000,
+                1061000,
+                1062000,
+                1063000,
+                1064000,
+                1065000,
+                1066000,
+                1067000,
+                1068000,
+                1069000,
+                1070000,
+                1071000,
+                1072000,
+                1073000,
+                1074000,
+                1075000,
+                1076000,
+                1077000,
+                1078000,
+                1079000,
+                1080000,
+                1081000,
+                1082000,
+                1083000,
+                1084000,
+                1085000,
+                1086000,
+                1087000,
+                1088000,
+                1089000,
+                1090000,
+                1091000,
+                1092000,
+                1093000,
+                1094000,
+                1095000,
+                1096000,
+                1097000,
+                1098000,
+                1099000,
+                1100000,
+                1101000,
+                1102000,
+                1103000,
+                1104000,
+                1105000,
+                1106000,
+                1107000,
+                1108000,
+                1109000,
+                1110000,
+                1111000,
+                1112000,
+                1113000,
+                1114000,
+                1115000,
+                1116000,
+                1117000,
+                1118000,
+                1119000,
+                1120000,
+                1121000,
+                1122000,
+                1123000,
+                1124000,
+                1125000,
+                1126000,
+                1127000,
+                1128000,
+                1129000,
+                1130000,
+                1131000,
+                1132000,
+                1133000,
+                1134000,
+                1135000,
+                1136000,
+                1137000,
+                1138000,
+                1139000,
+                1140000,
+                1141000,
+                1142000,
+                1143000,
+                1144000,
+                1145000,
+                1146000,
+                1147000,
+                1148000,
+                1149000,
+                1150000,
+                1151000,
+                1152000,
+                1153000,
+                1154000,
+                1155000,
+                1156000,
+                1157000,
+                1158000,
+                1159000,
+                1160000,
+                1161000,
+                1162000,
+                1163000,
+                1164000,
+                1165000,
+                1166000,
+                1167000,
+                1168000,
+                1169000,
+                1170000,
+                1171000,
+                1172000,
+                1173000,
+                1174000,
+                1175000,
+                1176000,
+                1177000,
+                1178000,
+                1179000,
+                1180000,
+                1181000,
+                1182000,
+                1183000,
+                1184000,
+                1185000,
+                1186000,
+                1187000,
+                1188000,
+                1189000,
+                1190000,
+                1191000,
+                1192000,
+                1193000,
+                1194000,
+                1195000,
+                1196000,
+                1197000,
+                1198000,
+                1199000,
+                1200000,
+                1201000,
+                1202000,
+                1203000,
+                1204000,
+                1205000,
+                1206000,
+                1207000,
+                1208000,
+                1209000,
+                1210000,
+                1211000,
+                1212000,
+                1213000,
+                1214000,
+                1215000,
+                1216000,
+                1217000,
+                1218000,
+                1219000,
+                1220000,
+                1221000,
+                1222000,
+                1223000,
+                1224000,
+                1225000,
+                1226000,
+                1227000,
+                1228000,
+                1229000,
+                1230000,
+                1231000,
+                1232000,
+                1233000,
+                1234000,
+                1235000,
+                1236000,
+                1237000,
+                1238000,
+                1239000,
+                1240000,
+                1241000,
+                1242000,
+                1243000,
+                1244000,
+                1245000,
+                1246000,
+                1247000,
+                1248000,
+                1249000,
+                1250000,
+                1251000,
+                1252000,
+                1253000,
+                1254000,
+                1255000,
+                1256000,
+                1257000,
+                1258000,
+                1259000,
+                1260000,
+                1261000,
+                1262000,
+                1263000,
+                1264000,
+                1265000,
+                1266000,
+                1267000,
+                1268000,
+                1269000,
+                1270000,
+                1271000,
+                1272000,
+                1273000,
+                1274000,
+                1275000,
+                1276000,
+                1277000,
+                1278000,
+                1279000,
+                1280000,
+                1281000,
+                1282000,
+                1283000,
+                1284000,
+                1285000,
+                1286000,
+                1287000,
+                1288000,
+                1289000,
+                1290000,
+                1291000,
+                1292000,
+                1293000,
+                1294000,
+                1295000,
+                1296000,
+                1297000,
+                1298000,
+                1299000,
+                1300000,
+                1301000,
+                1302000,
+                1303000,
+                1304000,
+                1305000,
+                1306000,
+                1307000,
+                1308000,
+                1309000,
+                1310000,
+                1311000,
+                1312000,
+                1313000,
+                1314000,
+                1315000,
+                1316000,
+                1317000,
+                1318000,
+                1319000,
+                1320000,
+                1321000,
+                1322000,
+                1323000,
+                1324000,
+                1325000,
+                1326000,
+                1327000,
+                1328000,
+                1329000,
+                1330000,
+                1331000,
+                1332000,
+                1333000,
+                1334000,
+                1335000,
+                1336000,
+                1337000,
+                1338000,
+                1339000,
+                1340000,
+                1341000,
+                1342000,
+                1343000,
+                1344000,
+                1345000,
+                1346000,
+                1347000,
+                1348000,
+                1349000,
+                1350000,
+                1351000,
+                1352000,
+                1353000,
+                1354000,
+                1355000,
+                1356000,
+                1357000,
+                1358000,
+                1359000,
+                1360000,
+                1361000,
+                1362000,
+                1363000,
+                1364000,
+                1365000,
+                1366000,
+                1367000,
+                1368000,
+                1369000,
+                1370000,
+                1371000,
+                1372000,
+                1373000,
+                1374000,
+                1375000,
+                1376000,
+                1377000,
+                1378000,
+                1379000,
+                1380000,
+                1381000,
+                1382000,
+                1383000,
+                1384000,
+                1385000,
+                1386000,
+                1387000,
+                1388000,
+                1389000,
+                1390000,
+                1391000,
+                1392000,
+                1393000,
+                1394000,
+                1395000,
+                1396000,
+                1397000,
+                1398000,
+                1399000,
+                1400000,
+                1401000,
+                1402000,
+                1403000,
+                1404000,
+                1405000,
+                1406000,
+                1407000,
+                1408000,
+                1409000,
+                1410000,
+                1411000,
+                1412000,
+                1413000,
+                1414000,
+                1415000,
+                1417000,
+                1418000,
+                1419000,
+                1420000,
+                1421000,
+                1422000,
+                1423000,
+                1424000,
+                1425000,
+                1426000,
+                1427000,
+                1428000,
+                1429000,
+                1430000,
+                1431000,
+                1432000,
+                1433000,
+                1434000,
+                1435000,
+                1436000,
+                1437000,
+                1438000,
+                1439000,
+                1440000,
+                1441000,
+                1442000,
+                1443000,
+                1444000,
+                1445000,
+                1446000,
+                1447000,
+                1448000,
+                1449000,
+                1450000,
+                1451000,
+                1452000,
+                1453000,
+                1454000,
+                1455000,
+                1456000,
+                1457000,
+                1458000,
+                1459000,
+                1460000,
+                1461000,
+                1462000,
+                1463000,
+                1464000,
+                1465000,
+                1466000,
+                1467000,
+                1468000,
+                1469000,
+                1470000,
+                1471000,
+                1472000,
+                1473000,
+                1474000,
+                1475000,
+                1476000,
+                1477000,
+                1478000,
+                1479000,
+                1480000,
+                1481000,
+                1482000,
+                1483000,
+                1484000,
+                1485000,
+                1486000,
+                1487000,
+                1488000,
+                1489000,
+                1490000,
+                1491000,
+                1492000,
+                1493000,
+                1494000,
+                1495000,
+                1496000,
+                1497000,
+                1498000,
+                1499000,
+                1500000,
+                1501000,
+                1502000,
+                1503000,
+                1504000,
+                1505000,
+                1506000,
+                1507000,
+                1508000,
+                1509000,
+                1510000,
+                1511000,
+                1512000,
+                1513000,
+                1514000,
+                1515000,
+                1516000,
+                1517000,
+                1518000,
+                1519000,
+                1520000,
+                1521000,
+                1522000,
+                1523000,
+                1524000,
+                1525000,
+                1526000,
+                1527000,
+                1528000,
+                1529000,
+                1530000,
+                1531000,
+                1532000,
+                1533000,
+                1534000,
+                1535000,
+                1536000,
+                1537000,
+                1538000,
+                1539000,
+                1540000,
+                1541000,
+                1542000,
+                1543000,
+                1544000,
+                1545000,
+                1546000,
+                1547000,
+                1548000,
+                1549000,
+                1550000,
+                1551000,
+                1552000,
+                1553000,
+                1554000,
+                1555000,
+                1556000,
+                1557000,
+                1558000,
+                1559000,
+                1560000,
+                1561000,
+                1562000,
+                1563000,
+                1564000,
+                1565000,
+                1566000,
+                1567000,
+                1568000,
+                1569000,
+                1570000,
+                1571000,
+                1572000,
+                1573000,
+                1574000,
+                1575000,
+                1576000,
+                1577000,
+                1578000,
+                1579000,
+                1580000,
+                1581000,
+                1582000,
+                1583000,
+                1584000,
+                1585000,
+                1586000,
+                1587000,
+                1588000,
+                1589000,
+                1590000,
+                1591000,
+                1592000,
+                1593000,
+                1594000,
+                1595000,
+                1596000,
+                1597000,
+                1598000,
+                1599000,
+                1600000,
+                1601000,
+                1602000,
+                1603000,
+                1604000,
+                1605000,
+                1606000,
+                1607000,
+                1608000,
+                1609000,
+                1610000,
+                1611000,
+                1612000,
+                1613000,
+                1614000,
+                1615000,
+                1616000,
+                1617000,
+                1618000,
+                1619000,
+                1620000,
+                1621000,
+                1622000,
+                1623000,
+                1624000,
+                1625000,
+                1626000,
+                1627000,
+                1628000,
+                1629000,
+                1630000,
+                1631000,
+                1632000,
+                1633000,
+                1634000,
+                1635000,
+                1636000,
+                1637000,
+                1638000,
+                1639000,
+                1640000,
+                1641000,
+                1642000,
+                1643000,
+                1644000,
+                1645000,
+                1646000,
+                1647000,
+                1648000,
+                1649000,
+                1650000,
+                1651000,
+                1652000,
+                1653000,
+                1654000,
+                1655000,
+                1656000,
+                1657000,
+                1658000,
+                1659000,
+                1660000,
+                1661000,
+                1662000,
+                1663000,
+                1664000,
+                1665000,
+                1666000,
+                1667000,
+                1668000,
+                1669000,
+                1670000,
+                1671000,
+                1672000,
+                1673000,
+                1674000,
+                1675000,
+                1676000,
+                1677000,
+                1678000,
+                1679000,
+                1680000,
+                1681000,
+                1682000,
+                1683000,
+                1684000,
+                1685000,
+                1686000,
+                1687000,
+                1688000,
+                1689000,
+                1690000,
+                1691000,
+                1692000,
+                1693000,
+                1694000,
+                1695000,
+                1696000,
+                1697000,
+                1698000,
+                1699000,
+                1700000,
+                1701000,
+                1702000,
+                1703000,
+                1704000,
+                1705000,
+                1706000,
+                1707000,
+                1708000,
+                1709000,
+                1710000,
+                1711000,
+                1712000,
+                1713000,
+                1714000,
+                1715000,
+                1716000,
+                1717000,
+                1718000,
+                1719000,
+                1720000,
+                1721000,
+                1722000,
+                1723000,
+                1724000,
+                1725000,
+                1726000,
+                1727000,
+                1728000,
+                1729000,
+                1730000,
+                1731000,
+                1732000,
+                1733000,
+                1734000,
+                1735000,
+                1736000,
+                1737000,
+                1738000,
+                1739000,
+                1740000,
+                1741000,
+                1742000,
+                1743000,
+                1744000,
+                1745000,
+                1746000,
+                1747000,
+                1748000,
+                1749000,
+                1750000,
+                1751000,
+                1752000,
+                1753000,
+                1754000,
+                1755000,
+                1756000,
+                1757000,
+                1758000,
+                1759000,
+                1760000,
+                1761000,
+                1762000,
+                1763000,
+                1764000,
+                1765000,
+                1766000,
+                1767000,
+                1768000,
+                1769000,
+                1770000,
+                1771000,
+                1772000,
+                1773000,
+                1774000,
+                1775000,
+                1776000,
+                1777000,
+                1778000,
+                1779000,
+                1780000,
+                1781000,
+                1782000,
+                1783000,
+                1784000,
+                1785000,
+                1786000,
+                1787000,
+                1788000,
+                1789000,
+                1790000,
+                1791000,
+                1792000,
+                1793000,
+                1794000,
+                1795000,
+                1796000,
+                1797000,
+                1798000,
+                1799000,
+                1800000,
+                1801000,
+                1802000,
+                1803000,
+                1804000,
+                1805000,
+                1806000,
+                1807000,
+                1808000,
+                1809000,
+                1810000,
+                1811000,
+                1812000,
+                1813000,
+                1814000,
+                1815000,
+                1816000,
+                1817000,
+                1818000,
+                1819000,
+                1820000,
+                1821000,
+                1822000,
+                1823000,
+                1824000,
+                1825000,
+                1826000,
+                1827000,
+                1828000,
+                1829000,
+                1830000,
+                1831000,
+                1832000,
+                1833000,
+                1834000,
+                1835000,
+                1836000,
+                1837000,
+                1838000,
+                1839000,
+                1840000,
+                1841000,
+                1842000,
+                1843000,
+                1844000,
+                1845000,
+                1846000,
+                1847000,
+                1848000,
+                1849000,
+                1850000,
+                1851000,
+                1852000,
+                1853000,
+                1854000,
+                1855000,
+                1856000,
+                1857000,
+                1858000,
+                1859000,
+                1860000,
+                1861000,
+                1862000,
+                1863000,
+                1864000,
+                1865000,
+                1866000,
+                1867000,
+                1868000,
+                1869000,
+                1870000,
+                1871000,
+                1872000,
+                1873000,
+                1874000,
+                1875000,
+                1876000,
+                1877000,
+                1878000,
+                1879000,
+                1880000,
+                1881000,
+                1882000,
+                1883000,
+                1884000,
+                1885000,
+                1886000,
+                1887000,
+                1888000,
+                1889000,
+                1890000,
+                1891000,
+                1892000,
+                1893000,
+                1894000,
+                1895000,
+                1896000,
+                1897000,
+                1898000,
+                1899000,
+                1900000,
+                1901000,
+                1902000,
+                1903000,
+                1904000,
+                1905000,
+                1906000,
+                1907000,
+                1908000,
+                1909000,
+                1910000,
+                1911000,
+                1912000,
+                1913000,
+                1914000,
+                1915000,
+                1916000,
+                1917000,
+                1918000,
+                1919000,
+                1920000,
+                1921000,
+                1922000,
+                1923000,
+                1924000,
+                1925000,
+                1926000,
+                1927000,
+                1928000,
+                1929000,
+                1930000,
+                1931000,
+                1932000,
+                1933000,
+                1934000,
+                1935000,
+                1936000,
+                1937000,
+                1938000,
+                1939000,
+                1940000,
+                1941000,
+                1942000,
+                1943000,
+                1944000,
+                1945000,
+                1946000,
+                1947000,
+                1948000,
+                1949000,
+                1950000,
+                1951000,
+                1952000,
+                1953000,
+                1954000,
+                1955000,
+                1956000,
+                1957000,
+                1958000,
+                1959000,
+                1960000,
+                1961000,
+                1962000,
+                1963000,
+                1964000,
+                1965000,
+                1966000,
+                1967000,
+                1968000,
+                1969000,
+                1970000,
+                1971000,
+                1972000,
+                1973000,
+                1974000,
+                1975000,
+                1976000,
+                1977000,
+                1978000,
+                1979000,
+                1980000,
+                1981000,
+                1982000,
+                1983000,
+                1984000,
+                1985000,
+                1986000,
+                1987000,
+                1988000,
+                1989000,
+                1990000,
+                1991000,
+                1992000,
+                1993000,
+                1994000,
+                1995000,
+                1996000,
+                1997000,
+                1998000,
+                1999000,
+                2000000,
+                2001000,
+                2002000,
+                2003000,
+                2004000,
+                2005000,
+                2006000,
+                2007000,
+                2008000,
+                2009000,
+                2010000,
+                2011000,
+                2012000,
+                2013000,
+                2014000,
+                2015000,
+                2016000,
+                2017000,
+                2018000,
+                2019000,
+                2020000,
+                2021000,
+                2022000,
+                2023000,
+                2024000,
+                2025000,
+                2026000,
+                2027000,
+                2028000,
+                2029000,
+                2030000,
+                2031000,
+                2032000,
+                2033000,
+                2034000,
+                2035000,
+                2036000,
+                2037000,
+                2038000,
+                2039000,
+                2040000,
+                2041000,
+                2042000,
+                2043000,
+                2044000,
+                2045000,
+                2046000,
+                2047000,
+                2048000,
+                2049000,
+                2050000,
+                2051000,
+                2052000,
+                2053000,
+                2054000,
+                2055000,
+                2056000,
+                2057000,
+                2058000,
+                2059000,
+                2060000,
+                2061000,
+                2062000,
+                2063000,
+                2064000,
+                2065000,
+                2066000,
+                2067000,
+                2068000,
+                2069000,
+                2070000,
+                2071000,
+                2072000,
+                2073000,
+                2074000,
+                2075000,
+                2076000,
+                2077000,
+                2078000,
+                2079000,
+                2080000,
+                2081000,
+                2082000,
+                2083000,
+                2084000,
+                2085000,
+                2086000,
+                2087000,
+                2088000,
+                2089000,
+                2090000,
+                2091000,
+                2092000,
+                2093000,
+                2094000,
+                2095000,
+                2096000,
+                2097000,
+                2098000,
+                2099000,
+                2100000,
+                2101000,
+                2102000,
+                2103000,
+                2104000,
+                2105000,
+                2106000,
+                2107000,
+                2108000,
+                2109000,
+                2110000,
+                2111000,
+                2112000,
+                2113000,
+                2114000,
+                2115000,
+                2116000,
+                2117000,
+                2118000,
+                2119000,
+                2120000,
+                2121000,
+                2122000,
+                2123000,
+                2124000,
+                2125000,
+                2126000,
+                2127000,
+                2128000,
+                2129000,
+                2130000,
+                2131000,
+                2132000,
+                2133000,
+                2134000,
+                2135000,
+                2136000,
+                2137000,
+                2138000,
+                2139000,
+                2140000,
+                2141000,
+                2142000,
+                2143000,
+                2144000,
+                2145000,
+                2146000,
+                2147000,
+                2148000,
+                2149000,
+                2150000,
+                2151000,
+                2152000,
+                2153000,
+                2154000,
+                2155000,
+                2156000,
+                2157000,
+                2158000,
+                2159000,
+                2160000,
+                2161000,
+                2162000,
+                2163000,
+                2164000,
+                2165000,
+                2166000,
+                2167000,
+                2168000,
+                2169000,
+                2170000,
+                2171000,
+                2172000,
+                2173000,
+                2174000,
+                2175000,
+                2176000,
+                2177000,
+                2178000,
+                2179000,
+                2180000,
+                2181000,
+                2182000,
+                2183000,
+                2184000,
+                2185000,
+                2186000,
+                2187000,
+                2188000,
+                2189000,
+                2190000,
+                2191000,
+                2192000,
+                2193000,
+                2194000,
+                2195000,
+                2196000,
+                2197000,
+                2198000,
+                2199000,
+                2200000,
+                2201000,
+                2202000,
+                2203000,
+                2204000,
+                2205000,
+                2206000,
+                2207000,
+                2208000,
+                2209000,
+                2210000,
+                2211000,
+                2212000,
+                2213000,
+                2214000,
+                2215000,
+                2216000,
+                2217000,
+                2218000,
+                2219000,
+                2220000,
+                2221000,
+                2222000,
+                2223000,
+                2224000,
+                2225000,
+                2226000,
+                2227000,
+                2228000,
+                2229000,
+                2230000,
+                2231000,
+                2232000,
+                2233000,
+                2234000,
+                2235000,
+                2236000,
+                2237000,
+                2238000,
+                2239000,
+                2240000,
+                2241000,
+                2242000,
+                2243000,
+                2244000,
+                2245000,
+                2246000,
+                2247000,
+                2248000,
+                2249000,
+                2250000,
+                2251000,
+                2252000,
+                2253000,
+                2254000,
+                2255000,
+                2256000,
+                2257000,
+                2258000,
+                2259000,
+                2260000,
+                2261000,
+                2262000,
+                2263000,
+                2264000,
+                2265000,
+                2266000,
+                2267000,
+                2268000,
+                2269000,
+                2270000,
+                2271000,
+                2272000,
+                2273000,
+                2274000,
+                2275000,
+                2276000,
+                2277000,
+                2278000,
+                2279000,
+                2280000,
+                2281000,
+                2282000,
+                2283000,
+                2284000,
+                2285000,
+                2286000,
+                2287000,
+                2288000,
+                2289000,
+                2290000,
+                2291000,
+                2292000,
+                2293000,
+                2294000,
+                2295000,
+                2296000,
+                2297000,
+                2298000,
+                2299000,
+                2300000,
+                2301000,
+                2302000,
+                2303000,
+                2304000,
+                2305000,
+                2306000,
+                2307000,
+                2308000,
+                2309000,
+                2310000,
+                2311000,
+                2312000,
+                2313000,
+                2314000,
+                2315000,
+                2316000,
+                2317000,
+                2318000,
+                2319000,
+                2320000,
+                2321000,
+                2322000,
+                2323000,
+                2324000,
+                2325000,
+                2326000,
+                2327000,
+                2328000,
+                2329000,
+                2330000,
+                2331000,
+                2332000,
+                2333000,
+                2334000,
+                2335000,
+                2336000,
+                2337000,
+                2338000,
+                2339000,
+                2340000,
+                2341000,
+                2342000,
+                2343000,
+                2344000,
+                2345000,
+                2346000,
+                2347000,
+                2348000,
+                2349000,
+                2350000,
+                2351000,
+                2352000,
+                2353000,
+                2354000,
+                2355000,
+                2356000,
+                2357000,
+                2358000,
+                2359000,
+                2360000,
+                2361000,
+                2362000,
+                2363000,
+                2364000,
+                2365000,
+                2366000,
+                2367000,
+                2368000,
+                2369000,
+                2370000,
+                2371000,
+                2372000,
+                2373000,
+                2374000,
+                2375000,
+                2376000,
+                2377000,
+                2378000,
+                2379000,
+                2380000,
+                2381000,
+                2382000,
+                2383000,
+                2384000,
+                2385000,
+                2386000,
+                2387000,
+                2388000,
+                2389000,
+                2390000,
+                2391000,
+                2392000,
+                2393000,
+                2394000,
+                2395000,
+                2396000,
+                2397000,
+                2398000,
+                2399000,
+                2400000,
+                2401000,
+                2402000,
+                2403000,
+                2404000,
+                2405000,
+                2406000,
+                2407000,
+                2408000,
+                2409000,
+                2410000,
+                2411000,
+                2412000,
+                2413000,
+                2414000,
+                2415000,
+                2416000,
+                2417000,
+                2418000,
+                2419000,
+                2420000,
+                2421000,
+                2422000,
+                2423000,
+                2424000,
+                2425000,
+                2426000,
+                2427000,
+                2428000,
+                2429000,
+                2430000,
+                2431000,
+                2432000,
+                2433000,
+                2434000,
+                2435000,
+                2436000,
+                2437000,
+                2438000,
+                2439000,
+                2440000,
+                2441000,
+                2442000,
+                2443000,
+                2444000,
+                2445000,
+                2446000,
+                2447000,
+                2448000,
+                2449000,
+                2450000,
+                2451000,
+                2452000,
+                2453000,
+                2454000,
+                2455000,
+                2456000,
+                2457000,
+                2458000,
+                2459000,
+                2460000,
+                2461000,
+                2462000,
+                2463000,
+                2464000,
+                2465000,
+                2466000,
+                2467000,
+                2468000,
+                2469000,
+                2470000,
+                2471000,
+                2472000,
+                2473000,
+                2474000,
+                2475000,
+                2476000,
+                2477000,
+                2478000,
+                2479000,
+                2480000,
+                2481000,
+                2482000,
+                2483000,
+                2484000,
+                2485000,
+                2486000,
+                2487000,
+                2488000,
+                2489000,
+                2490000,
+                2491000,
+                2492000,
+                2493000,
+                2494000,
+                2495000,
+                2496000,
+                2497000,
+                2498000,
+                2499000,
+                2500000,
+                2501000,
+                2502000,
+                2503000,
+                2504000,
+                2505000,
+                2506000,
+                2507000,
+                2508000,
+                2509000,
+                2510000,
+                2511000,
+                2512000,
+                2513000,
+                2514000,
+                2515000,
+                2516000,
+                2517000,
+                2518000,
+                2519000,
+                2520000,
+                2521000,
+                2522000,
+                2523000,
+                2524000,
+                2525000,
+                2526000,
+                2527000,
+                2528000,
+                2529000,
+                2530000,
+                2531000,
+                2532000,
+                2533000,
+                2534000,
+                2535000,
+                2536000,
+                2537000,
+                2538000,
+                2539000,
+                2540000,
+                2541000,
+                2542000,
+                2543000,
+                2544000,
+                2545000,
+                2546000,
+                2547000,
+                2548000,
+                2549000,
+                2550000,
+                2551000,
+                2552000,
+                2553000,
+                2554000,
+                2555000,
+                2556000,
+                2557000,
+                2558000,
+                2559000,
+                2560000,
+                2561000,
+                2562000,
+                2563000,
+                2564000,
+                2565000,
+                2566000,
+                2567000,
+                2568000,
+                2569000,
+                2570000,
+                2571000,
+                2572000,
+                2573000,
+                2574000,
+                2575000,
+                2576000,
+                2577000,
+                2578000,
+                2579000,
+                2580000,
+                2581000,
+                2582000,
+                2583000,
+                2584000,
+                2585000,
+                2586000,
+                2587000,
+                2588000,
+                2589000,
+                2590000,
+                2591000,
+                2592000,
+                2593000,
+                2594000,
+                2595000,
+                2596000,
+                2597000,
+                2598000,
+                2599000,
+                2600000,
+                2601000,
+                2602000,
+                2603000,
+                2604000,
+                2605000,
+                2606000,
+                2607000,
+                2608000,
+                2609000,
+                2610000,
+                2611000,
+                2612000,
+                2613000,
+                2614000,
+                2615000,
+                2616000,
+                2617000,
+                2618000,
+                2619000,
+                2620000,
+                2621000,
+                2622000,
+                2623000,
+                2624000,
+                2625000,
+                2626000,
+                2627000,
+                2628000,
+                2629000,
+                2630000,
+                2631000,
+                2632000,
+                2633000,
+                2634000,
+                2635000,
+                2636000,
+                2637000,
+                2638000,
+                2639000,
+                2640000,
+                2641000,
+                2642000,
+                2643000,
+                2644000,
+                2645000,
+                2646000,
+                2647000,
+                2648000,
+                2649000,
+                2650000,
+                2651000,
+                2652000,
+                2653000,
+                2654000,
+                2655000,
+                2656000,
+                2657000,
+                2658000,
+                2659000,
+                2660000,
+                2661000,
+                2662000,
+                2663000,
+                2664000,
+                2665000,
+                2666000,
+                2667000,
+                2668000,
+                2669000,
+                2670000,
+                2671000,
+                2672000,
+                2673000,
+                2674000,
+                2675000,
+                2676000,
+                2677000,
+                2678000,
+                2679000,
+                2680000,
+                2681000,
+                2682000,
+                2683000,
+                2684000,
+                2685000,
+                2686000,
+                2687000,
+                2688000,
+                2689000,
+                2690000,
+                2691000,
+                2692000,
+                2693000,
+                2694000,
+                2695000,
+                2696000,
+                2697000,
+                2698000,
+                2699000,
+                2700000,
+                2701000,
+                2702000,
+                2703000,
+                2704000,
+                2705000,
+                2706000,
+                2707000,
+                2708000,
+                2709000,
+                2710000,
+                2711000,
+                2712000,
+                2713000,
+                2714000,
+                2715000,
+                2716000,
+                2717000,
+                2718000,
+                2719000,
+                2720000,
+                2721000,
+                2722000,
+                2723000,
+                2724000,
+                2725000,
+                2726000,
+                2727000,
+                2728000,
+                2729000,
+                2730000,
+                2731000,
+                2732000,
+                2733000,
+                2734000,
+                2735000,
+                2736000,
+                2737000,
+                2738000,
+                2739000,
+                2740000,
+                2741000,
+                2742000,
+                2743000,
+                2744000,
+                2745000,
+                2746000,
+                2747000,
+                2748000,
+                2749000,
+                2750000,
+                2751000,
+                2752000,
+                2753000,
+                2754000,
+                2755000,
+                2756000,
+                2757000,
+                2758000,
+                2759000,
+                2760000,
+                2761000,
+                2762000,
+                2763000,
+                2764000,
+                2765000,
+                2766000,
+                2767000,
+                2768000,
+                2769000,
+                2770000,
+                2771000,
+                2772000,
+                2773000,
+                2774000,
+                2775000,
+                2776000,
+                2777000,
+                2778000,
+                2779000,
+                2780000,
+                2781000,
+                2782000,
+                2783000,
+                2784000,
+                2785000,
+                2786000,
+                2787000,
+                2788000,
+                2789000,
+                2790000,
+                2791000,
+                2792000,
+                2793000,
+                2794000,
+                2795000,
+                2796000,
+                2797000,
+                2798000,
+                2799000,
+                2800000,
+                2801000,
+                2802000,
+                2803000,
+                2804000,
+                2805000,
+                2806000,
+                2807000,
+                2808000,
+                2809000,
+                2810000,
+                2811000,
+                2812000,
+                2813000,
+                2814000,
+                2815000,
+                2816000,
+                2817000,
+                2818000,
+                2819000,
+                2820000,
+                2821000,
+                2822000,
+                2823000,
+                2824000,
+                2825000,
+                2826000,
+                2827000,
+                2828000,
+                2829000,
+                2830000,
+                2831000,
+                2832000,
+                2833000,
+                2834000,
+                2835000,
+                2836000,
+                2837000,
+                2838000,
+                2839000,
+                2840000,
+                2841000,
+                2842000,
+                2843000,
+                2844000,
+                2845000,
+                2846000,
+                2847000,
+                2848000,
+                2849000,
+                2850000,
+                2851000,
+                2852000,
+                2853000,
+                2854000,
+                2855000,
+                2856000,
+                2857000,
+                2858000,
+                2859000,
+                2860000,
+                2861000,
+                2862000,
+                2863000,
+                2864000,
+                2865000,
+                2866000,
+                2867000,
+                2868000,
+                2869000,
+                2870000,
+                2871000,
+                2872000,
+                2873000,
+                2874000,
+                2875000,
+                2876000,
+                2877000,
+                2878000,
+                2879000,
+                2880000,
+                2881000,
+                2882000,
+                2883000,
+                2884000,
+                2885000,
+                2886000,
+                2887000,
+                2888000,
+                2889000,
+                2890000,
+                2891000,
+                2892000,
+                2893000,
+                2894000,
+                2895000,
+                2896000,
+                2897000,
+                2898000,
+                2899000,
+                2900000,
+                2901000,
+                2902000,
+                2903000,
+                2904000,
+                2905000,
+                2906000,
+                2907000,
+                2908000,
+                2909000,
+                2910000,
+                2911000,
+                2912000,
+                2913000,
+                2914000,
+                2915000,
+                2916000,
+                2917000,
+                2918000,
+                2919000,
+                2920000,
+                2921000,
+                2922000,
+                2923000,
+                2924000,
+                2925000,
+                2926000,
+                2927000,
+                2928000,
+                2929000,
+                2930000,
+                2931000,
+                2932000,
+                2933000,
+                2934000,
+                2935000,
+                2936000,
+                2937000,
+                2938000,
+                2939000,
+                2940000,
+                2941000,
+                2942000,
+                2943000,
+                2944000,
+                2945000,
+                2946000,
+                2947000,
+                2948000,
+                2949000,
+                2950000,
+                2951000,
+                2952000,
+                2953000,
+                2954000,
+                2955000,
+                2956000,
+                2957000,
+                2958000,
+                2959000,
+                2960000,
+                2961000,
+                2962000,
+                2963000,
+                2964000,
+                2965000,
+                2966000,
+                2967000,
+                2968000,
+                2969000,
+                2970000,
+                2971000,
+                2972000,
+                2973000,
+                2974000,
+                2975000,
+                2976000,
+                2977000,
+                2978000,
+                2979000,
+                2980000,
+                2981000,
+                2982000,
+                2983000,
+                2984000,
+                2985000,
+                2986000,
+                2987000,
+                2988000,
+                2989000,
+                2990000,
+                2991000,
+                2992000,
+                2993000,
+                2994000,
+                2995000,
+                2996000,
+                2997000,
+                2998000,
+                2999000,
+                3000000,
+                3001000,
+                3002000,
+                3003000,
+                3004000,
+                3005000,
+                3006000,
+                3007000,
+                3008000,
+                3009000,
+                3010000,
+                3011000,
+                3012000,
+                3013000,
+                3014000,
+                3015000,
+                3016000,
+                3017000,
+                3018000,
+                3019000,
+                3020000,
+                3021000,
+                3022000,
+                3023000,
+                3024000,
+                3025000,
+                3026000,
+                3027000,
+                3028000,
+                3029000,
+                3030000,
+                3031000,
+                3032000,
+                3033000,
+                3034000,
+                3035000,
+                3036000,
+                3037000,
+                3038000,
+                3039000,
+                3040000,
+                3041000,
+                3042000,
+                3043000,
+                3044000,
+                3045000,
+                3046000,
+                3047000,
+                3048000,
+                3049000,
+                3050000,
+                3051000,
+                3052000,
+                3053000,
+                3054000,
+                3055000,
+                3056000,
+                3057000,
+                3058000,
+                3059000,
+                3060000,
+                3061000,
+                3062000,
+                3063000,
+                3064000,
+                3065000,
+                3066000,
+                3067000,
+                3068000,
+                3069000,
+                3070000,
+                3071000,
+                3072000,
+                3073000,
+                3074000,
+                3075000,
+                3076000,
+                3077000,
+                3078000,
+                3079000,
+                3080000,
+                3081000,
+                3082000,
+                3083000,
+                3084000,
+                3085000,
+                3086000,
+                3087000,
+                3088000,
+                3089000,
+                3090000,
+                3091000,
+                3092000,
+                3093000,
+                3094000,
+                3095000,
+                3096000,
+                3097000,
+                3098000,
+                3099000,
+                3100000,
+                3101000,
+                3102000,
+                3103000,
+                3104000,
+                3105000,
+                3106000,
+                3107000,
+                3108000,
+                3109000,
+                3110000,
+                3111000,
+                3112000,
+                3113000,
+                3114000,
+                3115000,
+                3116000,
+                3117000,
+                3118000,
+                3119000,
+                3120000,
+                3121000,
+                3122000,
+                3123000,
+                3124000,
+                3125000,
+                3126000,
+                3127000,
+                3128000,
+                3129000,
+                3130000,
+                3131000,
+                3132000,
+                3133000,
+                3134000,
+                3135000,
+                3136000,
+                3137000,
+                3138000,
+                3139000,
+                3140000,
+                3141000,
+                3142000,
+                3143000,
+                3144000,
+                3145000,
+                3146000,
+                3147000,
+                3148000,
+                3149000,
+                3150000,
+                3151000,
+                3152000,
+                3153000,
+                3154000,
+                3155000,
+                3156000,
+                3157000,
+                3158000,
+                3159000,
+                3160000,
+                3161000,
+                3162000,
+                3163000,
+                3164000,
+                3165000,
+                3166000,
+                3167000,
+                3168000,
+                3169000,
+                3170000,
+                3171000,
+                3172000,
+                3173000,
+                3174000,
+                3175000,
+                3176000,
+                3177000,
+                3178000,
+                3179000,
+                3180000,
+                3181000,
+                3182000,
+                3183000,
+                3184000,
+                3185000,
+                3186000,
+                3187000,
+                3188000,
+                3189000,
+                3190000,
+                3191000,
+                3192000,
+                3193000,
+                3194000,
+                3195000,
+                3196000,
+                3197000,
+                3198000,
+                3199000,
+                3200000,
+                3201000,
+                3202000,
+                3203000,
+                3204000,
+                3205000,
+                3206000,
+                3207000,
+                3208000,
+                3209000,
+                3210000,
+                3211000,
+                3212000,
+                3213000,
+                3214000,
+                3215000,
+                3216000,
+                3217000,
+                3218000,
+                3219000,
+                3220000,
+                3221000,
+                3222000,
+                3223000,
+                3224000,
+                3225000,
+                3226000,
+                3227000,
+                3228000,
+                3229000,
+                3230000,
+                3231000,
+                3232000,
+                3233000,
+                3234000,
+                3235000,
+                3236000,
+                3237000,
+                3238000,
+                3239000,
+                3240000,
+                3241000,
+                3242000,
+                3243000,
+                3244000,
+                3245000,
+                3246000,
+                3247000,
+                3248000,
+                3249000,
+                3250000,
+                3251000,
+                3252000,
+                3253000,
+                3254000,
+                3255000,
+                3256000,
+                3257000,
+                3258000,
+                3259000,
+                3260000,
+                3261000,
+                3262000,
+                3263000,
+                3264000,
+                3265000,
+                3266000,
+                3267000,
+                3268000,
+                3269000,
+                3270000,
+                3271000,
+                3272000,
+                3273000,
+                3274000,
+                3275000,
+                3276000,
+                3277000,
+                3278000,
+                3279000,
+                3281000,
+                3282000,
+                3283000,
+                3284000,
+                3285000,
+                3286000,
+                3287000,
+                3288000,
+                3289000,
+                3290000,
+                3291000,
+                3292000,
+                3293000,
+                3294000,
+                3295000,
+                3296000,
+                3297000,
+                3298000,
+                3299000,
+                3300000,
+                3301000,
+                3302000,
+                3303000,
+                3304000,
+                3305000,
+                3306000,
+                3307000,
+                3308000,
+                3309000,
+                3310000,
+                3311000,
+                3312000,
+                3313000,
+                3314000,
+                3315000,
+                3316000,
+                3317000,
+                3318000,
+                3319000,
+                3320000,
+                3321000,
+                3322000,
+                3323000,
+                3324000,
+                3325000,
+                3326000,
+                3327000,
+                3328000,
+                3329000,
+                3330000,
+                3331000,
+                3332000,
+                3333000,
+                3334000,
+                3335000,
+                3336000,
+                3337000,
+                3338000,
+                3339000,
+                3340000,
+                3341000,
+                3342000,
+                3343000,
+                3344000,
+                3345000,
+                3346000,
+                3347000,
+                3348000,
+                3349000,
+                3350000,
+                3351000,
+                3352000,
+                3353000,
+                3354000,
+                3355000,
+                3356000,
+                3357000,
+                3358000,
+                3359000,
+                3360000,
+                3361000,
+                3362000,
+                3363000,
+                3364000,
+                3365000,
+                3366000,
+                3367000,
+                3368000,
+                3369000,
+                3370000,
+                3371000,
+                3372000,
+                3373000,
+                3374000,
+                3375000,
+                3376000,
+                3377000,
+                3378000,
+                3379000,
+                3380000,
+                3381000,
+                3382000,
+                3383000,
+                3384000,
+                3385000,
+                3386000,
+                3387000,
+                3388000,
+                3389000,
+                3390000,
+                3391000,
+                3392000,
+                3393000,
+                3394000,
+                3395000,
+                3396000,
+                3397000,
+                3398000,
+                3399000,
+                3400000,
+                3401000,
+                3402000,
+                3403000,
+                3404000,
+                3405000,
+                3406000,
+                3407000,
+                3408000,
+                3409000,
+                3410000,
+                3411000,
+                3412000,
+                3413000,
+                3414000,
+                3415000,
+                3416000,
+                3417000,
+                3418000,
+                3419000,
+                3420000,
+                3421000,
+                3422000,
+                3423000,
+                3424000,
+                3425000,
+                3426000,
+                3427000,
+                3428000,
+                3429000,
+                3430000,
+                3431000,
+                3432000,
+                3433000,
+                3434000,
+                3435000,
+                3436000,
+                3437000,
+                3438000,
+                3439000,
+                3440000,
+                3441000,
+                3442000,
+                3443000,
+                3444000,
+                3445000,
+                3446000,
+                3447000,
+                3448000,
+                3449000,
+                3450000,
+                3451000,
+                3452000,
+                3453000,
+                3454000,
+                3455000,
+                3456000,
+                3457000,
+                3458000,
+                3459000,
+                3460000,
+                3461000,
+                3462000,
+                3463000,
+                3464000,
+                3465000,
+                3466000,
+                3467000,
+                3468000,
+                3469000,
+                3470000,
+                3471000,
+                3472000,
+                3473000
               ],
               "values": [
                 300,
diff --git a/fixtures/fit/suunto-ocean.divejson b/fixtures/fit/suunto-ocean.divejson
index e6733d4..5572846 100644
--- a/fixtures/fit/suunto-ocean.divejson
+++ b/fixtures/fit/suunto-ocean.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-05T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.2.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -13,8 +13,6 @@
       "duration": 4302,
       "max_depth": 45.91,
       "avg_depth": 19.43,
-      "cns_end": 20.0,
-      "otu_end": 55.0,
       "exit_position": {
         "latitude": 28.56723,
         "longitude": 34.533233
@@ -40,441 +38,443 @@
             "gf_low": 50,
             "gf_high": 85
           },
+          "cns_end": 20.0,
+          "otu_end": 55.0,
           "profile": {
-            "duration": 4301,
+            "duration": 4301000,
             "depth": {
               "times": [
                 0,
-                10,
-                20,
-                30,
-                40,
-                50,
-                60,
-                70,
-                80,
-                90,
-                100,
-                110,
-                120,
-                130,
-                140,
-                150,
-                160,
-                170,
-                180,
-                190,
-                200,
-                210,
-                220,
-                230,
-                240,
-                250,
-                260,
-                270,
-                280,
-                290,
-                300,
-                310,
-                320,
-                330,
-                340,
-                350,
-                360,
-                370,
-                380,
-                390,
-                400,
-                410,
-                420,
-                430,
-                440,
-                450,
-                460,
-                470,
-                480,
-                490,
-                500,
-                510,
-                520,
-                530,
-                540,
-                550,
-                560,
-                570,
-                580,
-                590,
-                600,
-                610,
-                620,
-                630,
-                640,
-                650,
-                660,
-                670,
-                680,
-                690,
-                700,
-                710,
-                720,
-                730,
-                740,
-                750,
-                760,
-                770,
-                780,
-                790,
-                800,
-                810,
-                820,
-                830,
-                840,
-                850,
-                860,
-                870,
-                880,
-                890,
-                900,
-                910,
-                920,
-                930,
-                940,
-                950,
-                960,
-                970,
-                980,
-                990,
-                1000,
-                1010,
-                1020,
-                1030,
-                1040,
-                1050,
-                1060,
-                1070,
-                1080,
-                1090,
-                1100,
-                1110,
-                1120,
-                1130,
-                1140,
-                1150,
-                1160,
-                1170,
-                1180,
-                1190,
-                1200,
-                1210,
-                1220,
-                1230,
-                1240,
-                1250,
-                1260,
-                1270,
-                1280,
-                1290,
-                1300,
-                1310,
-                1320,
-                1330,
-                1340,
-                1350,
-                1360,
-                1370,
-                1380,
-                1390,
-                1400,
-                1410,
-                1420,
-                1430,
-                1440,
-                1450,
-                1460,
-                1470,
-                1480,
-                1490,
-                1500,
-                1510,
-                1520,
-                1530,
-                1540,
-                1550,
-                1560,
-                1570,
-                1580,
-                1590,
-                1600,
-                1610,
-                1620,
-                1630,
-                1640,
-                1650,
-                1660,
-                1670,
-                1680,
-                1690,
-                1700,
-                1710,
-                1720,
-                1730,
-                1740,
-                1750,
-                1760,
-                1770,
-                1780,
-                1790,
-                1800,
-                1810,
-                1820,
-                1830,
-                1840,
-                1850,
-                1860,
-                1870,
-                1880,
-                1890,
-                1900,
-                1910,
-                1920,
-                1930,
-                1940,
-                1950,
-                1960,
-                1970,
-                1980,
-                1990,
-                2000,
-                2010,
-                2020,
-                2030,
-                2040,
-                2050,
-                2060,
-                2070,
-                2080,
-                2090,
-                2100,
-                2110,
-                2120,
-                2130,
-                2140,
-                2150,
-                2160,
-                2170,
-                2180,
-                2190,
-                2200,
-                2210,
-                2220,
-                2230,
-                2240,
-                2250,
-                2260,
-                2270,
-                2280,
-                2290,
-                2300,
-                2310,
-                2320,
-                2330,
-                2340,
-                2350,
-                2360,
-                2370,
-                2380,
-                2390,
-                2400,
-                2410,
-                2420,
-                2430,
-                2440,
-                2450,
-                2460,
-                2470,
-                2480,
-                2490,
-                2500,
-                2510,
-                2520,
-                2530,
-                2540,
-                2550,
-                2560,
-                2570,
-                2580,
-                2590,
-                2600,
-                2610,
-                2620,
-                2630,
-                2640,
-                2650,
-                2660,
-                2670,
-                2680,
-                2690,
-                2700,
-                2710,
-                2720,
-                2730,
-                2740,
-                2750,
-                2760,
-                2770,
-                2780,
-                2790,
-                2800,
-                2810,
-                2820,
-                2830,
-                2840,
-                2850,
-                2860,
-                2870,
-                2880,
-                2890,
-                2900,
-                2910,
-                2920,
-                2930,
-                2940,
-                2950,
-                2960,
-                2970,
-                2980,
-                2990,
-                3000,
-                3010,
-                3020,
-                3030,
-                3040,
-                3050,
-                3060,
-                3070,
-                3080,
-                3090,
-                3100,
-                3110,
-                3120,
-                3130,
-                3140,
-                3150,
-                3160,
-                3170,
-                3180,
-                3190,
-                3200,
-                3210,
-                3220,
-                3230,
-                3240,
-                3250,
-                3260,
-                3270,
-                3280,
-                3290,
-                3300,
-                3310,
-                3320,
-                3330,
-                3340,
-                3350,
-                3360,
-                3370,
-                3380,
-                3390,
-                3400,
-                3410,
-                3420,
-                3430,
-                3440,
-                3450,
-                3460,
-                3470,
-                3480,
-                3490,
-                3500,
-                3510,
-                3520,
-                3530,
-                3540,
-                3550,
-                3560,
-                3570,
-                3580,
-                3590,
-                3600,
-                3610,
-                3620,
-                3630,
-                3640,
-                3650,
-                3660,
-                3670,
-                3680,
-                3690,
-                3700,
-                3710,
-                3720,
-                3730,
-                3740,
-                3750,
-                3760,
-                3770,
-                3780,
-                3790,
-                3800,
-                3810,
-                3820,
-                3830,
-                3840,
-                3850,
-                3860,
-                3870,
-                3880,
-                3890,
-                3900,
-                3910,
-                3920,
-                3930,
-                3940,
-                3950,
-                3960,
-                3970,
-                3980,
-                3990,
-                4000,
-                4010,
-                4020,
-                4030,
-                4040,
-                4050,
-                4060,
-                4070,
-                4080,
-                4090,
-                4100,
-                4110,
-                4120,
-                4130,
-                4140,
-                4150,
-                4160,
-                4170,
-                4180,
-                4190,
-                4200,
-                4210,
-                4220,
-                4230,
-                4240,
-                4250,
-                4260,
-                4270,
-                4280,
-                4290,
-                4300
+                10000,
+                20000,
+                30000,
+                40000,
+                50000,
+                60000,
+                70000,
+                80000,
+                90000,
+                100000,
+                110000,
+                120000,
+                130000,
+                140000,
+                150000,
+                160000,
+                170000,
+                180000,
+                190000,
+                200000,
+                210000,
+                220000,
+                230000,
+                240000,
+                250000,
+                260000,
+                270000,
+                280000,
+                290000,
+                300000,
+                310000,
+                320000,
+                330000,
+                340000,
+                350000,
+                360000,
+                370000,
+                380000,
+                390000,
+                400000,
+                410000,
+                420000,
+                430000,
+                440000,
+                450000,
+                460000,
+                470000,
+                480000,
+                490000,
+                500000,
+                510000,
+                520000,
+                530000,
+                540000,
+                550000,
+                560000,
+                570000,
+                580000,
+                590000,
+                600000,
+                610000,
+                620000,
+                630000,
+                640000,
+                650000,
+                660000,
+                670000,
+                680000,
+                690000,
+                700000,
+                710000,
+                720000,
+                730000,
+                740000,
+                750000,
+                760000,
+                770000,
+                780000,
+                790000,
+                800000,
+                810000,
+                820000,
+                830000,
+                840000,
+                850000,
+                860000,
+                870000,
+                880000,
+                890000,
+                900000,
+                910000,
+                920000,
+                930000,
+                940000,
+                950000,
+                960000,
+                970000,
+                980000,
+                990000,
+                1000000,
+                1010000,
+                1020000,
+                1030000,
+                1040000,
+                1050000,
+                1060000,
+                1070000,
+                1080000,
+                1090000,
+                1100000,
+                1110000,
+                1120000,
+                1130000,
+                1140000,
+                1150000,
+                1160000,
+                1170000,
+                1180000,
+                1190000,
+                1200000,
+                1210000,
+                1220000,
+                1230000,
+                1240000,
+                1250000,
+                1260000,
+                1270000,
+                1280000,
+                1290000,
+                1300000,
+                1310000,
+                1320000,
+                1330000,
+                1340000,
+                1350000,
+                1360000,
+                1370000,
+                1380000,
+                1390000,
+                1400000,
+                1410000,
+                1420000,
+                1430000,
+                1440000,
+                1450000,
+                1460000,
+                1470000,
+                1480000,
+                1490000,
+                1500000,
+                1510000,
+                1520000,
+                1530000,
+                1540000,
+                1550000,
+                1560000,
+                1570000,
+                1580000,
+                1590000,
+                1600000,
+                1610000,
+                1620000,
+                1630000,
+                1640000,
+                1650000,
+                1660000,
+                1670000,
+                1680000,
+                1690000,
+                1700000,
+                1710000,
+                1720000,
+                1730000,
+                1740000,
+                1750000,
+                1760000,
+                1770000,
+                1780000,
+                1790000,
+                1800000,
+                1810000,
+                1820000,
+                1830000,
+                1840000,
+                1850000,
+                1860000,
+                1870000,
+                1880000,
+                1890000,
+                1900000,
+                1910000,
+                1920000,
+                1930000,
+                1940000,
+                1950000,
+                1960000,
+                1970000,
+                1980000,
+                1990000,
+                2000000,
+                2010000,
+                2020000,
+                2030000,
+                2040000,
+                2050000,
+                2060000,
+                2070000,
+                2080000,
+                2090000,
+                2100000,
+                2110000,
+                2120000,
+                2130000,
+                2140000,
+                2150000,
+                2160000,
+                2170000,
+                2180000,
+                2190000,
+                2200000,
+                2210000,
+                2220000,
+                2230000,
+                2240000,
+                2250000,
+                2260000,
+                2270000,
+                2280000,
+                2290000,
+                2300000,
+                2310000,
+                2320000,
+                2330000,
+                2340000,
+                2350000,
+                2360000,
+                2370000,
+                2380000,
+                2390000,
+                2400000,
+                2410000,
+                2420000,
+                2430000,
+                2440000,
+                2450000,
+                2460000,
+                2470000,
+                2480000,
+                2490000,
+                2500000,
+                2510000,
+                2520000,
+                2530000,
+                2540000,
+                2550000,
+                2560000,
+                2570000,
+                2580000,
+                2590000,
+                2600000,
+                2610000,
+                2620000,
+                2630000,
+                2640000,
+                2650000,
+                2660000,
+                2670000,
+                2680000,
+                2690000,
+                2700000,
+                2710000,
+                2720000,
+                2730000,
+                2740000,
+                2750000,
+                2760000,
+                2770000,
+                2780000,
+                2790000,
+                2800000,
+                2810000,
+                2820000,
+                2830000,
+                2840000,
+                2850000,
+                2860000,
+                2870000,
+                2880000,
+                2890000,
+                2900000,
+                2910000,
+                2920000,
+                2930000,
+                2940000,
+                2950000,
+                2960000,
+                2970000,
+                2980000,
+                2990000,
+                3000000,
+                3010000,
+                3020000,
+                3030000,
+                3040000,
+                3050000,
+                3060000,
+                3070000,
+                3080000,
+                3090000,
+                3100000,
+                3110000,
+                3120000,
+                3130000,
+                3140000,
+                3150000,
+                3160000,
+                3170000,
+                3180000,
+                3190000,
+                3200000,
+                3210000,
+                3220000,
+                3230000,
+                3240000,
+                3250000,
+                3260000,
+                3270000,
+                3280000,
+                3290000,
+                3300000,
+                3310000,
+                3320000,
+                3330000,
+                3340000,
+                3350000,
+                3360000,
+                3370000,
+                3380000,
+                3390000,
+                3400000,
+                3410000,
+                3420000,
+                3430000,
+                3440000,
+                3450000,
+                3460000,
+                3470000,
+                3480000,
+                3490000,
+                3500000,
+                3510000,
+                3520000,
+                3530000,
+                3540000,
+                3550000,
+                3560000,
+                3570000,
+                3580000,
+                3590000,
+                3600000,
+                3610000,
+                3620000,
+                3630000,
+                3640000,
+                3650000,
+                3660000,
+                3670000,
+                3680000,
+                3690000,
+                3700000,
+                3710000,
+                3720000,
+                3730000,
+                3740000,
+                3750000,
+                3760000,
+                3770000,
+                3780000,
+                3790000,
+                3800000,
+                3810000,
+                3820000,
+                3830000,
+                3840000,
+                3850000,
+                3860000,
+                3870000,
+                3880000,
+                3890000,
+                3900000,
+                3910000,
+                3920000,
+                3930000,
+                3940000,
+                3950000,
+                3960000,
+                3970000,
+                3980000,
+                3990000,
+                4000000,
+                4010000,
+                4020000,
+                4030000,
+                4040000,
+                4050000,
+                4060000,
+                4070000,
+                4080000,
+                4090000,
+                4100000,
+                4110000,
+                4120000,
+                4130000,
+                4140000,
+                4150000,
+                4160000,
+                4170000,
+                4180000,
+                4190000,
+                4200000,
+                4210000,
+                4220000,
+                4230000,
+                4240000,
+                4250000,
+                4260000,
+                4270000,
+                4280000,
+                4290000,
+                4300000
               ],
               "values": [
                 145,
@@ -912,4300 +912,4300 @@
             },
             "temperature": {
               "times": [
-                8,
-                9,
-                10,
-                11,
-                12,
-                13,
-                14,
-                15,
-                16,
-                17,
-                18,
-                19,
-                20,
-                21,
-                22,
-                23,
-                24,
-                25,
-                26,
-                27,
-                28,
-                29,
-                30,
-                31,
-                32,
-                33,
-                34,
-                35,
-                36,
-                37,
-                38,
-                39,
-                40,
-                41,
-                42,
-                43,
-                44,
-                45,
-                46,
-                47,
-                48,
-                49,
-                50,
-                51,
-                52,
-                53,
-                54,
-                55,
-                56,
-                57,
-                58,
-                59,
-                60,
-                61,
-                62,
-                63,
-                64,
-                65,
-                66,
-                67,
-                68,
-                69,
-                70,
-                71,
-                72,
-                73,
-                74,
-                75,
-                76,
-                77,
-                78,
-                79,
-                80,
-                81,
-                82,
-                83,
-                84,
-                85,
-                86,
-                87,
-                88,
-                89,
-                90,
-                91,
-                92,
-                93,
-                94,
-                95,
-                96,
-                97,
-                98,
-                99,
-                100,
-                101,
-                102,
-                103,
-                104,
-                105,
-                106,
-                107,
-                108,
-                109,
-                110,
-                111,
-                112,
-                113,
-                114,
-                115,
-                116,
-                117,
-                118,
-                119,
-                120,
-                121,
-                122,
-                123,
-                124,
-                125,
-                126,
-                127,
-                128,
-                129,
-                130,
-                131,
-                132,
-                133,
-                134,
-                135,
-                136,
-                137,
-                138,
-                139,
-                140,
-                141,
-                142,
-                143,
-                144,
-                145,
-                146,
-                147,
-                148,
-                149,
-                150,
-                151,
-                152,
-                153,
-                154,
-                155,
-                156,
-                157,
-                158,
-                159,
-                160,
-                161,
-                162,
-                163,
-                164,
-                165,
-                166,
-                167,
-                168,
-                169,
-                170,
-                171,
-                172,
-                173,
-                174,
-                175,
-                176,
-                177,
-                178,
-                179,
-                180,
-                181,
-                182,
-                183,
-                184,
-                185,
-                186,
-                187,
-                188,
-                189,
-                190,
-                191,
-                192,
-                193,
-                194,
-                195,
-                196,
-                197,
-                198,
-                199,
-                200,
-                201,
-                202,
-                203,
-                204,
-                205,
-                206,
-                207,
-                208,
-                209,
-                210,
-                211,
-                212,
-                213,
-                214,
-                215,
-                216,
-                217,
-                218,
-                219,
-                220,
-                221,
-                222,
-                223,
-                224,
-                225,
-                226,
-                227,
-                228,
-                229,
-                230,
-                231,
-                232,
-                233,
-                234,
-                235,
-                236,
-                237,
-                238,
-                239,
-                240,
-                241,
-                242,
-                243,
-                244,
-                245,
-                246,
-                247,
-                248,
-                249,
-                250,
-                251,
-                252,
-                253,
-                254,
-                255,
-                256,
-                257,
-                258,
-                259,
-                260,
-                261,
-                262,
-                263,
-                264,
-                265,
-                266,
-                267,
-                268,
-                269,
-                270,
-                271,
-                272,
-                273,
-                274,
-                275,
-                276,
-                277,
-                278,
-                279,
-                280,
-                281,
-                282,
-                283,
-                284,
-                285,
-                286,
-                287,
-                288,
-                289,
-                290,
-                291,
-                292,
-                293,
-                294,
-                295,
-                296,
-                297,
-                298,
-                299,
-                300,
-                301,
-                302,
-                303,
-                304,
-                305,
-                306,
-                307,
-                308,
-                309,
-                310,
-                311,
-                312,
-                313,
-                314,
-                315,
-                316,
-                317,
-                318,
-                319,
-                320,
-                321,
-                322,
-                323,
-                324,
-                325,
-                326,
-                327,
-                328,
-                329,
-                330,
-                331,
-                332,
-                333,
-                334,
-                335,
-                336,
-                337,
-                338,
-                339,
-                340,
-                341,
-                342,
-                343,
-                344,
-                345,
-                346,
-                347,
-                348,
-                349,
-                350,
-                351,
-                352,
-                353,
-                354,
-                355,
-                356,
-                357,
-                358,
-                359,
-                360,
-                361,
-                362,
-                363,
-                364,
-                365,
-                366,
-                367,
-                368,
-                369,
-                370,
-                371,
-                372,
-                373,
-                374,
-                375,
-                376,
-                377,
-                378,
-                379,
-                380,
-                381,
-                382,
-                383,
-                384,
-                385,
-                386,
-                387,
-                388,
-                389,
-                390,
-                391,
-                392,
-                393,
-                394,
-                395,
-                396,
-                397,
-                398,
-                399,
-                400,
-                401,
-                402,
-                403,
-                404,
-                405,
-                406,
-                407,
-                408,
-                409,
-                410,
-                411,
-                412,
-                413,
-                414,
-                415,
-                416,
-                417,
-                418,
-                419,
-                420,
-                421,
-                422,
-                423,
-                424,
-                425,
-                426,
-                427,
-                428,
-                429,
-                430,
-                431,
-                432,
-                433,
-                434,
-                435,
-                436,
-                437,
-                438,
-                439,
-                440,
-                441,
-                442,
-                443,
-                444,
-                445,
-                446,
-                447,
-                448,
-                449,
-                450,
-                451,
-                452,
-                453,
-                454,
-                455,
-                456,
-                457,
-                458,
-                459,
-                460,
-                461,
-                462,
-                463,
-                464,
-                465,
-                466,
-                467,
-                468,
-                469,
-                470,
-                471,
-                472,
-                473,
-                474,
-                475,
-                476,
-                477,
-                478,
-                479,
-                480,
-                481,
-                482,
-                483,
-                484,
-                485,
-                486,
-                487,
-                488,
-                489,
-                490,
-                491,
-                492,
-                493,
-                494,
-                495,
-                496,
-                497,
-                498,
-                499,
-                500,
-                501,
-                502,
-                503,
-                504,
-                505,
-                506,
-                507,
-                508,
-                509,
-                510,
-                511,
-                512,
-                513,
-                514,
-                515,
-                516,
-                517,
-                518,
-                519,
-                520,
-                521,
-                522,
-                523,
-                524,
-                525,
-                526,
-                527,
-                528,
-                529,
-                530,
-                531,
-                532,
-                533,
-                534,
-                535,
-                536,
-                537,
-                538,
-                539,
-                540,
-                541,
-                542,
-                543,
-                544,
-                545,
-                546,
-                547,
-                548,
-                549,
-                550,
-                551,
-                552,
-                553,
-                554,
-                555,
-                556,
-                557,
-                558,
-                559,
-                560,
-                561,
-                562,
-                563,
-                564,
-                565,
-                566,
-                567,
-                568,
-                569,
-                570,
-                571,
-                572,
-                573,
-                574,
-                575,
-                576,
-                577,
-                578,
-                579,
-                580,
-                581,
-                582,
-                583,
-                584,
-                585,
-                586,
-                587,
-                588,
-                589,
-                590,
-                591,
-                592,
-                593,
-                594,
-                595,
-                596,
-                597,
-                598,
-                599,
-                600,
-                601,
-                602,
-                603,
-                604,
-                605,
-                606,
-                607,
-                608,
-                609,
-                610,
-                611,
-                612,
-                613,
-                614,
-                615,
-                616,
-                617,
-                618,
-                619,
-                620,
-                621,
-                622,
-                623,
-                624,
-                625,
-                626,
-                627,
-                628,
-                629,
-                630,
-                631,
-                632,
-                633,
-                634,
-                635,
-                636,
-                637,
-                638,
-                639,
-                640,
-                641,
-                642,
-                643,
-                644,
-                645,
-                646,
-                647,
-                648,
-                649,
-                650,
-                651,
-                652,
-                653,
-                654,
-                655,
-                656,
-                657,
-                658,
-                659,
-                660,
-                661,
-                662,
-                663,
-                664,
-                665,
-                666,
-                667,
-                668,
-                669,
-                670,
-                671,
-                672,
-                673,
-                674,
-                675,
-                676,
-                677,
-                678,
-                679,
-                680,
-                681,
-                682,
-                683,
-                684,
-                685,
-                686,
-                687,
-                688,
-                689,
-                690,
-                691,
-                692,
-                693,
-                694,
-                695,
-                696,
-                697,
-                698,
-                699,
-                700,
-                701,
-                702,
-                703,
-                704,
-                705,
-                706,
-                707,
-                708,
-                709,
-                710,
-                711,
-                712,
-                713,
-                714,
-                715,
-                716,
-                717,
-                718,
-                719,
-                720,
-                721,
-                722,
-                723,
-                724,
-                725,
-                726,
-                727,
-                728,
-                729,
-                730,
-                731,
-                732,
-                733,
-                734,
-                735,
-                736,
-                737,
-                738,
-                739,
-                740,
-                741,
-                742,
-                743,
-                744,
-                745,
-                746,
-                747,
-                748,
-                749,
-                750,
-                751,
-                752,
-                753,
-                754,
-                755,
-                756,
-                757,
-                758,
-                759,
-                760,
-                761,
-                762,
-                763,
-                764,
-                765,
-                766,
-                767,
-                768,
-                769,
-                770,
-                771,
-                772,
-                773,
-                774,
-                775,
-                776,
-                777,
-                778,
-                779,
-                780,
-                781,
-                782,
-                783,
-                784,
-                785,
-                786,
-                787,
-                788,
-                789,
-                790,
-                791,
-                792,
-                793,
-                794,
-                795,
-                796,
-                797,
-                798,
-                799,
-                800,
-                801,
-                802,
-                803,
-                804,
-                805,
-                806,
-                807,
-                808,
-                809,
-                810,
-                811,
-                812,
-                813,
-                814,
-                815,
-                816,
-                817,
-                818,
-                819,
-                820,
-                821,
-                822,
-                823,
-                824,
-                825,
-                826,
-                827,
-                828,
-                829,
-                830,
-                831,
-                832,
-                833,
-                834,
-                835,
-                836,
-                837,
-                838,
-                839,
-                840,
-                841,
-                842,
-                843,
-                844,
-                845,
-                846,
-                847,
-                848,
-                849,
-                850,
-                851,
-                852,
-                853,
-                854,
-                855,
-                856,
-                857,
-                858,
-                859,
-                860,
-                861,
-                862,
-                863,
-                864,
-                865,
-                866,
-                867,
-                868,
-                869,
-                870,
-                871,
-                872,
-                873,
-                874,
-                875,
-                876,
-                877,
-                878,
-                879,
-                880,
-                881,
-                882,
-                883,
-                884,
-                885,
-                886,
-                887,
-                888,
-                889,
-                890,
-                891,
-                892,
-                893,
-                894,
-                895,
-                896,
-                897,
-                898,
-                899,
-                900,
-                901,
-                902,
-                903,
-                904,
-                905,
-                906,
-                907,
-                908,
-                909,
-                910,
-                911,
-                912,
-                913,
-                914,
-                915,
-                916,
-                917,
-                918,
-                919,
-                920,
-                921,
-                922,
-                923,
-                924,
-                925,
-                926,
-                927,
-                928,
-                929,
-                930,
-                931,
-                932,
-                933,
-                934,
-                935,
-                936,
-                937,
-                938,
-                939,
-                940,
-                941,
-                942,
-                943,
-                944,
-                945,
-                946,
-                947,
-                948,
-                949,
-                950,
-                951,
-                952,
-                953,
-                954,
-                955,
-                956,
-                957,
-                958,
-                959,
-                960,
-                961,
-                962,
-                963,
-                964,
-                965,
-                966,
-                967,
-                968,
-                969,
-                970,
-                971,
-                972,
-                973,
-                974,
-                975,
-                976,
-                977,
-                978,
-                979,
-                980,
-                981,
-                982,
-                983,
-                984,
-                985,
-                986,
-                987,
-                988,
-                989,
-                990,
-                991,
-                992,
-                993,
-                994,
-                995,
-                996,
-                997,
-                998,
-                999,
-                1000,
-                1001,
-                1002,
-                1003,
-                1004,
-                1005,
-                1006,
-                1007,
-                1008,
-                1009,
-                1010,
-                1011,
-                1012,
-                1013,
-                1014,
-                1015,
-                1016,
-                1017,
-                1018,
-                1019,
-                1020,
-                1021,
-                1022,
-                1023,
-                1024,
-                1025,
-                1026,
-                1027,
-                1028,
-                1029,
-                1030,
-                1031,
-                1032,
-                1033,
-                1034,
-                1035,
-                1036,
-                1037,
-                1038,
-                1039,
-                1040,
-                1041,
-                1042,
-                1043,
-                1044,
-                1045,
-                1046,
-                1047,
-                1048,
-                1049,
-                1050,
-                1051,
-                1052,
-                1053,
-                1054,
-                1055,
-                1056,
-                1057,
-                1058,
-                1059,
-                1060,
-                1061,
-                1062,
-                1063,
-                1064,
-                1065,
-                1066,
-                1067,
-                1068,
-                1069,
-                1070,
-                1071,
-                1072,
-                1073,
-                1074,
-                1075,
-                1076,
-                1077,
-                1078,
-                1079,
-                1080,
-                1081,
-                1082,
-                1083,
-                1084,
-                1085,
-                1086,
-                1087,
-                1088,
-                1089,
-                1090,
-                1091,
-                1092,
-                1093,
-                1094,
-                1095,
-                1096,
-                1097,
-                1098,
-                1099,
-                1100,
-                1101,
-                1102,
-                1103,
-                1104,
-                1105,
-                1106,
-                1107,
-                1108,
-                1109,
-                1110,
-                1111,
-                1112,
-                1113,
-                1114,
-                1115,
-                1116,
-                1117,
-                1118,
-                1119,
-                1120,
-                1121,
-                1122,
-                1123,
-                1124,
-                1125,
-                1126,
-                1127,
-                1128,
-                1129,
-                1130,
-                1131,
-                1132,
-                1133,
-                1134,
-                1135,
-                1136,
-                1137,
-                1138,
-                1139,
-                1140,
-                1141,
-                1142,
-                1143,
-                1144,
-                1145,
-                1146,
-                1147,
-                1148,
-                1149,
-                1150,
-                1151,
-                1152,
-                1153,
-                1154,
-                1155,
-                1156,
-                1157,
-                1158,
-                1159,
-                1160,
-                1161,
-                1162,
-                1163,
-                1164,
-                1165,
-                1166,
-                1167,
-                1168,
-                1169,
-                1170,
-                1171,
-                1172,
-                1173,
-                1174,
-                1175,
-                1176,
-                1177,
-                1178,
-                1179,
-                1180,
-                1181,
-                1182,
-                1183,
-                1184,
-                1185,
-                1186,
-                1187,
-                1188,
-                1189,
-                1190,
-                1191,
-                1192,
-                1193,
-                1194,
-                1195,
-                1196,
-                1197,
-                1198,
-                1199,
-                1200,
-                1201,
-                1202,
-                1203,
-                1204,
-                1205,
-                1206,
-                1207,
-                1208,
-                1209,
-                1210,
-                1211,
-                1212,
-                1213,
-                1214,
-                1215,
-                1216,
-                1217,
-                1218,
-                1219,
-                1220,
-                1221,
-                1222,
-                1223,
-                1224,
-                1225,
-                1226,
-                1227,
-                1228,
-                1229,
-                1230,
-                1231,
-                1232,
-                1233,
-                1234,
-                1235,
-                1236,
-                1237,
-                1238,
-                1239,
-                1240,
-                1241,
-                1242,
-                1243,
-                1244,
-                1245,
-                1246,
-                1247,
-                1248,
-                1249,
-                1250,
-                1251,
-                1252,
-                1253,
-                1254,
-                1255,
-                1256,
-                1257,
-                1258,
-                1259,
-                1260,
-                1261,
-                1262,
-                1263,
-                1264,
-                1265,
-                1266,
-                1267,
-                1268,
-                1269,
-                1270,
-                1271,
-                1272,
-                1273,
-                1274,
-                1275,
-                1276,
-                1277,
-                1278,
-                1279,
-                1280,
-                1281,
-                1282,
-                1283,
-                1284,
-                1285,
-                1286,
-                1287,
-                1288,
-                1289,
-                1290,
-                1291,
-                1292,
-                1293,
-                1294,
-                1295,
-                1296,
-                1297,
-                1298,
-                1299,
-                1300,
-                1301,
-                1302,
-                1303,
-                1304,
-                1305,
-                1306,
-                1307,
-                1308,
-                1309,
-                1310,
-                1311,
-                1312,
-                1313,
-                1314,
-                1315,
-                1316,
-                1317,
-                1318,
-                1319,
-                1320,
-                1321,
-                1322,
-                1323,
-                1324,
-                1325,
-                1326,
-                1327,
-                1328,
-                1329,
-                1330,
-                1331,
-                1332,
-                1333,
-                1334,
-                1335,
-                1336,
-                1337,
-                1338,
-                1339,
-                1340,
-                1341,
-                1342,
-                1343,
-                1344,
-                1345,
-                1346,
-                1347,
-                1348,
-                1349,
-                1350,
-                1351,
-                1352,
-                1353,
-                1354,
-                1355,
-                1356,
-                1357,
-                1358,
-                1359,
-                1360,
-                1361,
-                1362,
-                1363,
-                1364,
-                1365,
-                1366,
-                1367,
-                1368,
-                1369,
-                1370,
-                1371,
-                1372,
-                1373,
-                1374,
-                1375,
-                1376,
-                1377,
-                1378,
-                1379,
-                1380,
-                1381,
-                1382,
-                1383,
-                1384,
-                1385,
-                1386,
-                1387,
-                1388,
-                1389,
-                1390,
-                1391,
-                1392,
-                1393,
-                1394,
-                1395,
-                1396,
-                1397,
-                1398,
-                1399,
-                1400,
-                1401,
-                1402,
-                1403,
-                1404,
-                1405,
-                1406,
-                1407,
-                1408,
-                1409,
-                1410,
-                1411,
-                1412,
-                1413,
-                1414,
-                1415,
-                1416,
-                1417,
-                1418,
-                1419,
-                1420,
-                1421,
-                1422,
-                1423,
-                1424,
-                1425,
-                1426,
-                1427,
-                1428,
-                1429,
-                1430,
-                1431,
-                1432,
-                1433,
-                1434,
-                1435,
-                1436,
-                1437,
-                1438,
-                1439,
-                1440,
-                1441,
-                1442,
-                1443,
-                1444,
-                1445,
-                1446,
-                1447,
-                1448,
-                1449,
-                1450,
-                1451,
-                1452,
-                1453,
-                1454,
-                1455,
-                1456,
-                1457,
-                1458,
-                1459,
-                1460,
-                1461,
-                1462,
-                1463,
-                1464,
-                1465,
-                1466,
-                1467,
-                1468,
-                1469,
-                1470,
-                1471,
-                1472,
-                1473,
-                1474,
-                1475,
-                1476,
-                1477,
-                1478,
-                1479,
-                1480,
-                1481,
-                1482,
-                1483,
-                1484,
-                1485,
-                1486,
-                1487,
-                1488,
-                1489,
-                1490,
-                1491,
-                1492,
-                1493,
-                1494,
-                1495,
-                1496,
-                1497,
-                1498,
-                1499,
-                1500,
-                1501,
-                1502,
-                1503,
-                1504,
-                1505,
-                1506,
-                1507,
-                1508,
-                1509,
-                1510,
-                1511,
-                1512,
-                1513,
-                1514,
-                1515,
-                1516,
-                1517,
-                1518,
-                1519,
-                1520,
-                1521,
-                1522,
-                1523,
-                1524,
-                1525,
-                1526,
-                1527,
-                1528,
-                1529,
-                1530,
-                1531,
-                1532,
-                1533,
-                1534,
-                1535,
-                1536,
-                1537,
-                1538,
-                1539,
-                1540,
-                1541,
-                1542,
-                1543,
-                1544,
-                1545,
-                1546,
-                1547,
-                1548,
-                1549,
-                1550,
-                1551,
-                1552,
-                1553,
-                1554,
-                1555,
-                1556,
-                1557,
-                1558,
-                1559,
-                1560,
-                1561,
-                1562,
-                1563,
-                1564,
-                1565,
-                1566,
-                1567,
-                1568,
-                1569,
-                1570,
-                1571,
-                1572,
-                1573,
-                1574,
-                1575,
-                1576,
-                1577,
-                1578,
-                1579,
-                1580,
-                1581,
-                1582,
-                1583,
-                1584,
-                1585,
-                1586,
-                1587,
-                1588,
-                1589,
-                1590,
-                1591,
-                1592,
-                1593,
-                1594,
-                1595,
-                1596,
-                1597,
-                1598,
-                1599,
-                1600,
-                1601,
-                1602,
-                1603,
-                1604,
-                1605,
-                1606,
-                1607,
-                1608,
-                1609,
-                1610,
-                1611,
-                1612,
-                1613,
-                1614,
-                1615,
-                1616,
-                1617,
-                1618,
-                1619,
-                1620,
-                1621,
-                1622,
-                1623,
-                1624,
-                1625,
-                1626,
-                1627,
-                1628,
-                1629,
-                1630,
-                1631,
-                1632,
-                1633,
-                1634,
-                1635,
-                1636,
-                1637,
-                1638,
-                1639,
-                1640,
-                1641,
-                1642,
-                1643,
-                1644,
-                1645,
-                1646,
-                1647,
-                1648,
-                1649,
-                1650,
-                1651,
-                1652,
-                1653,
-                1654,
-                1655,
-                1656,
-                1657,
-                1658,
-                1659,
-                1660,
-                1661,
-                1662,
-                1663,
-                1664,
-                1665,
-                1666,
-                1667,
-                1668,
-                1669,
-                1670,
-                1671,
-                1672,
-                1673,
-                1674,
-                1675,
-                1676,
-                1677,
-                1678,
-                1679,
-                1680,
-                1681,
-                1682,
-                1683,
-                1684,
-                1685,
-                1686,
-                1687,
-                1688,
-                1689,
-                1690,
-                1691,
-                1692,
-                1693,
-                1694,
-                1695,
-                1696,
-                1697,
-                1698,
-                1699,
-                1700,
-                1701,
-                1702,
-                1703,
-                1704,
-                1705,
-                1706,
-                1707,
-                1708,
-                1709,
-                1710,
-                1711,
-                1712,
-                1713,
-                1714,
-                1715,
-                1716,
-                1717,
-                1718,
-                1719,
-                1720,
-                1721,
-                1722,
-                1723,
-                1724,
-                1725,
-                1726,
-                1727,
-                1728,
-                1729,
-                1730,
-                1731,
-                1732,
-                1733,
-                1734,
-                1735,
-                1736,
-                1737,
-                1738,
-                1739,
-                1740,
-                1741,
-                1742,
-                1743,
-                1744,
-                1745,
-                1746,
-                1747,
-                1748,
-                1749,
-                1750,
-                1751,
-                1752,
-                1753,
-                1754,
-                1755,
-                1756,
-                1757,
-                1758,
-                1759,
-                1760,
-                1761,
-                1762,
-                1763,
-                1764,
-                1765,
-                1766,
-                1767,
-                1768,
-                1769,
-                1770,
-                1771,
-                1772,
-                1773,
-                1774,
-                1775,
-                1776,
-                1777,
-                1778,
-                1779,
-                1780,
-                1781,
-                1782,
-                1783,
-                1784,
-                1785,
-                1786,
-                1787,
-                1788,
-                1789,
-                1790,
-                1791,
-                1792,
-                1793,
-                1794,
-                1795,
-                1796,
-                1797,
-                1798,
-                1799,
-                1800,
-                1801,
-                1802,
-                1803,
-                1804,
-                1805,
-                1806,
-                1807,
-                1808,
-                1809,
-                1810,
-                1811,
-                1812,
-                1813,
-                1814,
-                1815,
-                1816,
-                1817,
-                1818,
-                1819,
-                1820,
-                1821,
-                1822,
-                1823,
-                1824,
-                1825,
-                1826,
-                1827,
-                1828,
-                1829,
-                1830,
-                1831,
-                1832,
-                1833,
-                1834,
-                1835,
-                1836,
-                1837,
-                1838,
-                1839,
-                1840,
-                1841,
-                1842,
-                1843,
-                1844,
-                1845,
-                1846,
-                1847,
-                1848,
-                1849,
-                1850,
-                1851,
-                1852,
-                1853,
-                1854,
-                1855,
-                1856,
-                1857,
-                1858,
-                1859,
-                1860,
-                1861,
-                1862,
-                1863,
-                1864,
-                1865,
-                1866,
-                1867,
-                1868,
-                1869,
-                1870,
-                1871,
-                1872,
-                1873,
-                1874,
-                1875,
-                1876,
-                1877,
-                1878,
-                1879,
-                1880,
-                1881,
-                1882,
-                1883,
-                1884,
-                1885,
-                1886,
-                1887,
-                1888,
-                1889,
-                1890,
-                1891,
-                1892,
-                1893,
-                1894,
-                1895,
-                1896,
-                1897,
-                1898,
-                1899,
-                1900,
-                1901,
-                1902,
-                1903,
-                1904,
-                1905,
-                1906,
-                1907,
-                1908,
-                1909,
-                1910,
-                1911,
-                1912,
-                1913,
-                1914,
-                1915,
-                1916,
-                1917,
-                1918,
-                1919,
-                1920,
-                1921,
-                1922,
-                1923,
-                1924,
-                1925,
-                1926,
-                1927,
-                1928,
-                1929,
-                1930,
-                1931,
-                1932,
-                1933,
-                1934,
-                1935,
-                1936,
-                1937,
-                1938,
-                1939,
-                1940,
-                1941,
-                1942,
-                1943,
-                1944,
-                1945,
-                1946,
-                1947,
-                1948,
-                1949,
-                1950,
-                1951,
-                1952,
-                1953,
-                1954,
-                1955,
-                1956,
-                1957,
-                1958,
-                1959,
-                1960,
-                1961,
-                1962,
-                1963,
-                1964,
-                1965,
-                1966,
-                1967,
-                1968,
-                1969,
-                1970,
-                1971,
-                1972,
-                1973,
-                1974,
-                1975,
-                1976,
-                1977,
-                1978,
-                1979,
-                1980,
-                1981,
-                1982,
-                1983,
-                1984,
-                1985,
-                1986,
-                1987,
-                1988,
-                1989,
-                1990,
-                1991,
-                1992,
-                1993,
-                1994,
-                1995,
-                1996,
-                1997,
-                1998,
-                1999,
-                2000,
-                2001,
-                2002,
-                2003,
-                2004,
-                2005,
-                2006,
-                2007,
-                2008,
-                2009,
-                2010,
-                2011,
-                2012,
-                2013,
-                2014,
-                2015,
-                2016,
-                2017,
-                2018,
-                2019,
-                2020,
-                2021,
-                2022,
-                2023,
-                2024,
-                2025,
-                2026,
-                2027,
-                2028,
-                2029,
-                2030,
-                2031,
-                2032,
-                2033,
-                2034,
-                2035,
-                2036,
-                2037,
-                2038,
-                2039,
-                2040,
-                2041,
-                2042,
-                2043,
-                2044,
-                2045,
-                2046,
-                2047,
-                2048,
-                2049,
-                2050,
-                2051,
-                2052,
-                2053,
-                2054,
-                2055,
-                2056,
-                2057,
-                2058,
-                2059,
-                2060,
-                2061,
-                2062,
-                2063,
-                2064,
-                2065,
-                2066,
-                2067,
-                2068,
-                2069,
-                2070,
-                2071,
-                2072,
-                2073,
-                2074,
-                2075,
-                2076,
-                2077,
-                2078,
-                2079,
-                2080,
-                2081,
-                2082,
-                2083,
-                2084,
-                2085,
-                2086,
-                2087,
-                2088,
-                2089,
-                2090,
-                2091,
-                2092,
-                2093,
-                2094,
-                2095,
-                2096,
-                2097,
-                2098,
-                2099,
-                2100,
-                2101,
-                2102,
-                2103,
-                2104,
-                2105,
-                2106,
-                2107,
-                2108,
-                2109,
-                2110,
-                2111,
-                2112,
-                2113,
-                2114,
-                2115,
-                2116,
-                2117,
-                2118,
-                2119,
-                2120,
-                2121,
-                2122,
-                2123,
-                2124,
-                2125,
-                2126,
-                2127,
-                2128,
-                2129,
-                2130,
-                2131,
-                2132,
-                2133,
-                2134,
-                2135,
-                2136,
-                2137,
-                2138,
-                2139,
-                2140,
-                2141,
-                2142,
-                2143,
-                2144,
-                2145,
-                2146,
-                2147,
-                2148,
-                2149,
-                2150,
-                2151,
-                2152,
-                2153,
-                2154,
-                2155,
-                2156,
-                2157,
-                2158,
-                2159,
-                2160,
-                2161,
-                2162,
-                2163,
-                2164,
-                2165,
-                2166,
-                2167,
-                2168,
-                2169,
-                2170,
-                2171,
-                2172,
-                2173,
-                2174,
-                2175,
-                2176,
-                2177,
-                2178,
-                2179,
-                2180,
-                2181,
-                2182,
-                2183,
-                2184,
-                2185,
-                2186,
-                2187,
-                2188,
-                2189,
-                2190,
-                2191,
-                2192,
-                2193,
-                2194,
-                2195,
-                2196,
-                2197,
-                2198,
-                2199,
-                2200,
-                2201,
-                2202,
-                2203,
-                2204,
-                2205,
-                2206,
-                2207,
-                2208,
-                2209,
-                2210,
-                2211,
-                2212,
-                2213,
-                2214,
-                2215,
-                2216,
-                2217,
-                2218,
-                2219,
-                2220,
-                2221,
-                2222,
-                2223,
-                2224,
-                2225,
-                2226,
-                2227,
-                2228,
-                2229,
-                2230,
-                2231,
-                2232,
-                2233,
-                2234,
-                2235,
-                2236,
-                2237,
-                2238,
-                2239,
-                2240,
-                2241,
-                2242,
-                2243,
-                2244,
-                2245,
-                2246,
-                2247,
-                2248,
-                2249,
-                2250,
-                2251,
-                2252,
-                2253,
-                2254,
-                2255,
-                2256,
-                2257,
-                2258,
-                2259,
-                2260,
-                2261,
-                2262,
-                2263,
-                2264,
-                2265,
-                2266,
-                2267,
-                2268,
-                2269,
-                2270,
-                2271,
-                2272,
-                2273,
-                2274,
-                2275,
-                2276,
-                2277,
-                2278,
-                2279,
-                2280,
-                2281,
-                2282,
-                2283,
-                2284,
-                2285,
-                2286,
-                2287,
-                2288,
-                2289,
-                2290,
-                2291,
-                2292,
-                2293,
-                2294,
-                2295,
-                2296,
-                2297,
-                2298,
-                2299,
-                2300,
-                2301,
-                2302,
-                2303,
-                2304,
-                2305,
-                2306,
-                2307,
-                2308,
-                2309,
-                2310,
-                2311,
-                2312,
-                2313,
-                2314,
-                2315,
-                2316,
-                2317,
-                2318,
-                2319,
-                2320,
-                2321,
-                2322,
-                2323,
-                2324,
-                2325,
-                2326,
-                2327,
-                2328,
-                2329,
-                2330,
-                2331,
-                2332,
-                2333,
-                2334,
-                2335,
-                2336,
-                2337,
-                2338,
-                2339,
-                2340,
-                2341,
-                2342,
-                2343,
-                2344,
-                2345,
-                2346,
-                2347,
-                2348,
-                2349,
-                2350,
-                2351,
-                2352,
-                2353,
-                2354,
-                2355,
-                2356,
-                2357,
-                2358,
-                2359,
-                2360,
-                2361,
-                2362,
-                2363,
-                2364,
-                2365,
-                2366,
-                2367,
-                2368,
-                2369,
-                2370,
-                2371,
-                2372,
-                2373,
-                2374,
-                2375,
-                2376,
-                2377,
-                2378,
-                2379,
-                2380,
-                2381,
-                2382,
-                2383,
-                2384,
-                2385,
-                2386,
-                2387,
-                2388,
-                2389,
-                2390,
-                2391,
-                2392,
-                2393,
-                2394,
-                2395,
-                2396,
-                2397,
-                2398,
-                2399,
-                2400,
-                2401,
-                2402,
-                2403,
-                2404,
-                2405,
-                2406,
-                2407,
-                2408,
-                2409,
-                2410,
-                2411,
-                2412,
-                2413,
-                2414,
-                2415,
-                2416,
-                2417,
-                2418,
-                2419,
-                2420,
-                2421,
-                2422,
-                2423,
-                2424,
-                2425,
-                2426,
-                2427,
-                2428,
-                2429,
-                2430,
-                2431,
-                2432,
-                2433,
-                2434,
-                2435,
-                2436,
-                2437,
-                2438,
-                2439,
-                2440,
-                2441,
-                2442,
-                2443,
-                2444,
-                2445,
-                2446,
-                2447,
-                2448,
-                2449,
-                2450,
-                2451,
-                2452,
-                2453,
-                2454,
-                2455,
-                2456,
-                2457,
-                2458,
-                2459,
-                2460,
-                2461,
-                2462,
-                2463,
-                2464,
-                2465,
-                2466,
-                2467,
-                2468,
-                2469,
-                2470,
-                2471,
-                2472,
-                2473,
-                2474,
-                2475,
-                2476,
-                2477,
-                2478,
-                2479,
-                2480,
-                2481,
-                2482,
-                2483,
-                2484,
-                2485,
-                2486,
-                2487,
-                2488,
-                2489,
-                2490,
-                2491,
-                2492,
-                2493,
-                2494,
-                2495,
-                2496,
-                2497,
-                2498,
-                2499,
-                2500,
-                2501,
-                2502,
-                2503,
-                2504,
-                2505,
-                2506,
-                2507,
-                2508,
-                2509,
-                2510,
-                2511,
-                2512,
-                2513,
-                2514,
-                2515,
-                2516,
-                2517,
-                2518,
-                2519,
-                2520,
-                2521,
-                2522,
-                2523,
-                2524,
-                2525,
-                2526,
-                2527,
-                2528,
-                2529,
-                2530,
-                2531,
-                2532,
-                2533,
-                2534,
-                2535,
-                2536,
-                2537,
-                2538,
-                2539,
-                2540,
-                2541,
-                2542,
-                2543,
-                2544,
-                2545,
-                2546,
-                2547,
-                2548,
-                2549,
-                2550,
-                2551,
-                2552,
-                2553,
-                2554,
-                2555,
-                2556,
-                2557,
-                2558,
-                2559,
-                2560,
-                2561,
-                2562,
-                2563,
-                2564,
-                2565,
-                2566,
-                2567,
-                2568,
-                2569,
-                2570,
-                2571,
-                2572,
-                2573,
-                2574,
-                2575,
-                2576,
-                2577,
-                2578,
-                2579,
-                2580,
-                2581,
-                2582,
-                2583,
-                2584,
-                2585,
-                2586,
-                2587,
-                2588,
-                2589,
-                2590,
-                2591,
-                2592,
-                2593,
-                2594,
-                2595,
-                2596,
-                2597,
-                2598,
-                2599,
-                2600,
-                2601,
-                2602,
-                2603,
-                2604,
-                2605,
-                2606,
-                2607,
-                2608,
-                2609,
-                2610,
-                2611,
-                2612,
-                2613,
-                2614,
-                2615,
-                2616,
-                2617,
-                2618,
-                2619,
-                2620,
-                2621,
-                2622,
-                2623,
-                2624,
-                2625,
-                2626,
-                2627,
-                2628,
-                2629,
-                2630,
-                2631,
-                2632,
-                2633,
-                2634,
-                2635,
-                2636,
-                2637,
-                2638,
-                2639,
-                2640,
-                2641,
-                2642,
-                2643,
-                2644,
-                2645,
-                2646,
-                2647,
-                2648,
-                2649,
-                2650,
-                2651,
-                2652,
-                2653,
-                2654,
-                2655,
-                2656,
-                2657,
-                2658,
-                2659,
-                2660,
-                2661,
-                2662,
-                2663,
-                2664,
-                2665,
-                2666,
-                2667,
-                2668,
-                2669,
-                2670,
-                2671,
-                2672,
-                2673,
-                2674,
-                2675,
-                2676,
-                2677,
-                2678,
-                2679,
-                2680,
-                2681,
-                2682,
-                2683,
-                2684,
-                2685,
-                2686,
-                2687,
-                2688,
-                2689,
-                2690,
-                2691,
-                2692,
-                2693,
-                2694,
-                2695,
-                2696,
-                2697,
-                2698,
-                2699,
-                2700,
-                2701,
-                2702,
-                2703,
-                2704,
-                2705,
-                2706,
-                2707,
-                2708,
-                2709,
-                2710,
-                2711,
-                2712,
-                2713,
-                2714,
-                2715,
-                2716,
-                2717,
-                2718,
-                2719,
-                2720,
-                2721,
-                2722,
-                2723,
-                2724,
-                2725,
-                2726,
-                2727,
-                2728,
-                2729,
-                2730,
-                2731,
-                2732,
-                2733,
-                2734,
-                2735,
-                2736,
-                2737,
-                2738,
-                2739,
-                2740,
-                2741,
-                2742,
-                2743,
-                2744,
-                2745,
-                2746,
-                2747,
-                2748,
-                2749,
-                2750,
-                2751,
-                2752,
-                2753,
-                2754,
-                2755,
-                2756,
-                2757,
-                2758,
-                2759,
-                2760,
-                2761,
-                2762,
-                2763,
-                2764,
-                2765,
-                2766,
-                2767,
-                2768,
-                2769,
-                2770,
-                2771,
-                2772,
-                2773,
-                2774,
-                2775,
-                2776,
-                2777,
-                2778,
-                2779,
-                2780,
-                2781,
-                2782,
-                2783,
-                2784,
-                2785,
-                2786,
-                2787,
-                2788,
-                2789,
-                2790,
-                2791,
-                2792,
-                2793,
-                2794,
-                2795,
-                2796,
-                2797,
-                2798,
-                2799,
-                2800,
-                2801,
-                2802,
-                2803,
-                2804,
-                2805,
-                2806,
-                2807,
-                2808,
-                2809,
-                2810,
-                2811,
-                2812,
-                2813,
-                2814,
-                2815,
-                2816,
-                2817,
-                2818,
-                2819,
-                2820,
-                2821,
-                2822,
-                2823,
-                2824,
-                2825,
-                2826,
-                2827,
-                2828,
-                2829,
-                2830,
-                2831,
-                2832,
-                2833,
-                2834,
-                2835,
-                2836,
-                2837,
-                2838,
-                2839,
-                2840,
-                2841,
-                2842,
-                2843,
-                2844,
-                2845,
-                2846,
-                2847,
-                2848,
-                2849,
-                2850,
-                2851,
-                2852,
-                2853,
-                2854,
-                2855,
-                2856,
-                2857,
-                2858,
-                2859,
-                2860,
-                2861,
-                2862,
-                2863,
-                2864,
-                2865,
-                2866,
-                2867,
-                2868,
-                2869,
-                2870,
-                2871,
-                2872,
-                2873,
-                2874,
-                2875,
-                2876,
-                2877,
-                2878,
-                2879,
-                2880,
-                2881,
-                2882,
-                2883,
-                2884,
-                2885,
-                2886,
-                2887,
-                2888,
-                2889,
-                2890,
-                2891,
-                2892,
-                2893,
-                2894,
-                2895,
-                2896,
-                2897,
-                2898,
-                2899,
-                2900,
-                2901,
-                2902,
-                2903,
-                2904,
-                2905,
-                2906,
-                2907,
-                2908,
-                2909,
-                2910,
-                2911,
-                2912,
-                2913,
-                2914,
-                2915,
-                2916,
-                2917,
-                2918,
-                2919,
-                2920,
-                2921,
-                2922,
-                2923,
-                2924,
-                2925,
-                2926,
-                2927,
-                2928,
-                2929,
-                2930,
-                2931,
-                2932,
-                2933,
-                2934,
-                2935,
-                2936,
-                2937,
-                2938,
-                2939,
-                2940,
-                2941,
-                2942,
-                2943,
-                2944,
-                2945,
-                2946,
-                2947,
-                2948,
-                2949,
-                2950,
-                2951,
-                2952,
-                2953,
-                2954,
-                2955,
-                2956,
-                2957,
-                2958,
-                2959,
-                2960,
-                2961,
-                2962,
-                2963,
-                2964,
-                2965,
-                2966,
-                2967,
-                2968,
-                2969,
-                2970,
-                2971,
-                2972,
-                2973,
-                2974,
-                2975,
-                2976,
-                2977,
-                2978,
-                2979,
-                2980,
-                2981,
-                2982,
-                2983,
-                2984,
-                2985,
-                2986,
-                2987,
-                2988,
-                2989,
-                2990,
-                2991,
-                2992,
-                2993,
-                2994,
-                2995,
-                2996,
-                2997,
-                2998,
-                2999,
-                3000,
-                3001,
-                3002,
-                3003,
-                3004,
-                3005,
-                3006,
-                3007,
-                3008,
-                3009,
-                3010,
-                3011,
-                3012,
-                3013,
-                3014,
-                3015,
-                3016,
-                3017,
-                3018,
-                3019,
-                3020,
-                3021,
-                3022,
-                3023,
-                3024,
-                3025,
-                3026,
-                3027,
-                3028,
-                3029,
-                3030,
-                3031,
-                3032,
-                3033,
-                3034,
-                3035,
-                3036,
-                3037,
-                3038,
-                3039,
-                3040,
-                3041,
-                3042,
-                3043,
-                3044,
-                3045,
-                3046,
-                3047,
-                3048,
-                3049,
-                3050,
-                3051,
-                3052,
-                3053,
-                3054,
-                3055,
-                3056,
-                3057,
-                3058,
-                3059,
-                3060,
-                3061,
-                3062,
-                3063,
-                3064,
-                3065,
-                3066,
-                3067,
-                3068,
-                3069,
-                3070,
-                3071,
-                3072,
-                3073,
-                3074,
-                3075,
-                3076,
-                3077,
-                3078,
-                3079,
-                3080,
-                3081,
-                3082,
-                3083,
-                3084,
-                3085,
-                3086,
-                3087,
-                3088,
-                3089,
-                3090,
-                3091,
-                3092,
-                3093,
-                3094,
-                3095,
-                3096,
-                3097,
-                3098,
-                3099,
-                3100,
-                3101,
-                3102,
-                3103,
-                3104,
-                3105,
-                3106,
-                3107,
-                3108,
-                3109,
-                3110,
-                3111,
-                3112,
-                3113,
-                3114,
-                3115,
-                3116,
-                3117,
-                3118,
-                3119,
-                3120,
-                3121,
-                3122,
-                3123,
-                3124,
-                3125,
-                3126,
-                3127,
-                3128,
-                3129,
-                3130,
-                3131,
-                3132,
-                3133,
-                3134,
-                3135,
-                3136,
-                3137,
-                3138,
-                3139,
-                3140,
-                3141,
-                3142,
-                3143,
-                3144,
-                3145,
-                3146,
-                3147,
-                3148,
-                3149,
-                3150,
-                3151,
-                3152,
-                3153,
-                3154,
-                3155,
-                3156,
-                3157,
-                3158,
-                3159,
-                3160,
-                3161,
-                3162,
-                3163,
-                3164,
-                3165,
-                3166,
-                3167,
-                3168,
-                3169,
-                3170,
-                3171,
-                3172,
-                3173,
-                3174,
-                3175,
-                3176,
-                3177,
-                3178,
-                3179,
-                3180,
-                3181,
-                3182,
-                3183,
-                3184,
-                3185,
-                3186,
-                3187,
-                3188,
-                3189,
-                3190,
-                3191,
-                3192,
-                3193,
-                3194,
-                3195,
-                3196,
-                3197,
-                3198,
-                3199,
-                3200,
-                3201,
-                3202,
-                3203,
-                3204,
-                3205,
-                3206,
-                3207,
-                3208,
-                3209,
-                3210,
-                3211,
-                3212,
-                3213,
-                3214,
-                3215,
-                3216,
-                3217,
-                3218,
-                3219,
-                3220,
-                3221,
-                3222,
-                3223,
-                3224,
-                3225,
-                3226,
-                3227,
-                3228,
-                3229,
-                3230,
-                3231,
-                3232,
-                3233,
-                3234,
-                3235,
-                3236,
-                3237,
-                3238,
-                3239,
-                3240,
-                3241,
-                3242,
-                3243,
-                3244,
-                3245,
-                3246,
-                3247,
-                3248,
-                3249,
-                3250,
-                3251,
-                3252,
-                3253,
-                3254,
-                3255,
-                3256,
-                3257,
-                3258,
-                3259,
-                3260,
-                3261,
-                3262,
-                3263,
-                3264,
-                3265,
-                3266,
-                3267,
-                3268,
-                3269,
-                3270,
-                3271,
-                3272,
-                3273,
-                3274,
-                3275,
-                3276,
-                3277,
-                3278,
-                3279,
-                3280,
-                3281,
-                3282,
-                3283,
-                3284,
-                3285,
-                3286,
-                3287,
-                3288,
-                3289,
-                3290,
-                3291,
-                3292,
-                3293,
-                3294,
-                3295,
-                3296,
-                3297,
-                3298,
-                3299,
-                3300,
-                3301,
-                3302,
-                3303,
-                3304,
-                3305,
-                3306,
-                3307,
-                3308,
-                3309,
-                3310,
-                3311,
-                3312,
-                3313,
-                3314,
-                3315,
-                3316,
-                3317,
-                3318,
-                3319,
-                3320,
-                3321,
-                3322,
-                3323,
-                3324,
-                3325,
-                3326,
-                3327,
-                3328,
-                3329,
-                3330,
-                3331,
-                3332,
-                3333,
-                3334,
-                3335,
-                3336,
-                3337,
-                3338,
-                3339,
-                3340,
-                3341,
-                3342,
-                3343,
-                3344,
-                3345,
-                3346,
-                3347,
-                3348,
-                3349,
-                3350,
-                3351,
-                3352,
-                3353,
-                3354,
-                3355,
-                3356,
-                3357,
-                3358,
-                3359,
-                3360,
-                3361,
-                3362,
-                3363,
-                3364,
-                3365,
-                3366,
-                3367,
-                3368,
-                3369,
-                3370,
-                3371,
-                3372,
-                3373,
-                3374,
-                3375,
-                3376,
-                3377,
-                3378,
-                3379,
-                3380,
-                3381,
-                3382,
-                3383,
-                3384,
-                3385,
-                3386,
-                3387,
-                3388,
-                3389,
-                3390,
-                3391,
-                3392,
-                3393,
-                3394,
-                3395,
-                3396,
-                3397,
-                3398,
-                3399,
-                3400,
-                3401,
-                3402,
-                3403,
-                3404,
-                3405,
-                3406,
-                3407,
-                3408,
-                3409,
-                3410,
-                3411,
-                3412,
-                3413,
-                3414,
-                3415,
-                3416,
-                3417,
-                3418,
-                3419,
-                3420,
-                3421,
-                3422,
-                3423,
-                3424,
-                3425,
-                3426,
-                3427,
-                3428,
-                3429,
-                3430,
-                3431,
-                3432,
-                3433,
-                3434,
-                3435,
-                3436,
-                3437,
-                3438,
-                3439,
-                3440,
-                3441,
-                3442,
-                3443,
-                3444,
-                3445,
-                3446,
-                3447,
-                3448,
-                3449,
-                3450,
-                3451,
-                3452,
-                3453,
-                3454,
-                3455,
-                3456,
-                3457,
-                3458,
-                3459,
-                3460,
-                3461,
-                3462,
-                3463,
-                3464,
-                3465,
-                3466,
-                3467,
-                3468,
-                3469,
-                3470,
-                3471,
-                3472,
-                3473,
-                3474,
-                3475,
-                3476,
-                3477,
-                3478,
-                3479,
-                3480,
-                3481,
-                3482,
-                3483,
-                3484,
-                3485,
-                3486,
-                3487,
-                3488,
-                3489,
-                3490,
-                3491,
-                3492,
-                3493,
-                3494,
-                3495,
-                3496,
-                3497,
-                3498,
-                3499,
-                3500,
-                3501,
-                3502,
-                3503,
-                3504,
-                3505,
-                3506,
-                3507,
-                3508,
-                3509,
-                3510,
-                3511,
-                3512,
-                3513,
-                3514,
-                3515,
-                3516,
-                3517,
-                3518,
-                3519,
-                3520,
-                3521,
-                3522,
-                3523,
-                3524,
-                3525,
-                3526,
-                3527,
-                3528,
-                3529,
-                3530,
-                3531,
-                3532,
-                3533,
-                3534,
-                3535,
-                3536,
-                3537,
-                3538,
-                3539,
-                3540,
-                3541,
-                3542,
-                3543,
-                3544,
-                3545,
-                3546,
-                3547,
-                3548,
-                3549,
-                3550,
-                3551,
-                3552,
-                3553,
-                3554,
-                3555,
-                3556,
-                3557,
-                3558,
-                3559,
-                3560,
-                3561,
-                3562,
-                3563,
-                3564,
-                3565,
-                3566,
-                3567,
-                3568,
-                3569,
-                3570,
-                3571,
-                3572,
-                3573,
-                3574,
-                3575,
-                3576,
-                3577,
-                3578,
-                3579,
-                3580,
-                3581,
-                3582,
-                3583,
-                3584,
-                3585,
-                3586,
-                3587,
-                3588,
-                3589,
-                3590,
-                3591,
-                3592,
-                3593,
-                3594,
-                3595,
-                3596,
-                3597,
-                3598,
-                3599,
-                3600,
-                3601,
-                3602,
-                3603,
-                3604,
-                3605,
-                3606,
-                3607,
-                3608,
-                3609,
-                3610,
-                3611,
-                3612,
-                3613,
-                3614,
-                3615,
-                3616,
-                3617,
-                3618,
-                3619,
-                3620,
-                3621,
-                3622,
-                3623,
-                3624,
-                3625,
-                3626,
-                3627,
-                3628,
-                3629,
-                3630,
-                3631,
-                3632,
-                3633,
-                3634,
-                3635,
-                3636,
-                3637,
-                3638,
-                3639,
-                3640,
-                3641,
-                3642,
-                3643,
-                3644,
-                3645,
-                3646,
-                3647,
-                3648,
-                3649,
-                3650,
-                3651,
-                3652,
-                3653,
-                3654,
-                3655,
-                3656,
-                3657,
-                3658,
-                3659,
-                3660,
-                3661,
-                3662,
-                3663,
-                3664,
-                3665,
-                3666,
-                3667,
-                3668,
-                3669,
-                3670,
-                3671,
-                3672,
-                3673,
-                3674,
-                3675,
-                3676,
-                3677,
-                3678,
-                3679,
-                3680,
-                3681,
-                3682,
-                3683,
-                3684,
-                3685,
-                3686,
-                3687,
-                3688,
-                3689,
-                3690,
-                3691,
-                3692,
-                3693,
-                3694,
-                3695,
-                3696,
-                3697,
-                3698,
-                3699,
-                3700,
-                3701,
-                3702,
-                3703,
-                3704,
-                3705,
-                3706,
-                3707,
-                3708,
-                3709,
-                3710,
-                3711,
-                3712,
-                3713,
-                3714,
-                3715,
-                3716,
-                3717,
-                3718,
-                3719,
-                3720,
-                3721,
-                3722,
-                3723,
-                3724,
-                3725,
-                3726,
-                3727,
-                3728,
-                3729,
-                3730,
-                3731,
-                3732,
-                3733,
-                3734,
-                3735,
-                3736,
-                3737,
-                3738,
-                3739,
-                3740,
-                3741,
-                3742,
-                3743,
-                3744,
-                3745,
-                3746,
-                3747,
-                3748,
-                3749,
-                3750,
-                3751,
-                3752,
-                3753,
-                3754,
-                3755,
-                3756,
-                3757,
-                3758,
-                3759,
-                3760,
-                3761,
-                3762,
-                3763,
-                3764,
-                3765,
-                3766,
-                3767,
-                3768,
-                3769,
-                3770,
-                3771,
-                3772,
-                3773,
-                3774,
-                3775,
-                3776,
-                3777,
-                3778,
-                3779,
-                3780,
-                3781,
-                3782,
-                3783,
-                3784,
-                3785,
-                3786,
-                3787,
-                3788,
-                3789,
-                3790,
-                3791,
-                3792,
-                3793,
-                3794,
-                3795,
-                3796,
-                3797,
-                3798,
-                3799,
-                3800,
-                3801,
-                3802,
-                3803,
-                3804,
-                3805,
-                3806,
-                3807,
-                3808,
-                3809,
-                3810,
-                3811,
-                3812,
-                3813,
-                3814,
-                3815,
-                3816,
-                3817,
-                3818,
-                3819,
-                3820,
-                3821,
-                3822,
-                3823,
-                3824,
-                3825,
-                3826,
-                3827,
-                3828,
-                3829,
-                3830,
-                3831,
-                3832,
-                3833,
-                3834,
-                3835,
-                3836,
-                3837,
-                3838,
-                3839,
-                3840,
-                3841,
-                3842,
-                3843,
-                3844,
-                3845,
-                3846,
-                3847,
-                3848,
-                3849,
-                3850,
-                3851,
-                3852,
-                3853,
-                3854,
-                3855,
-                3856,
-                3857,
-                3858,
-                3859,
-                3860,
-                3861,
-                3862,
-                3863,
-                3864,
-                3865,
-                3866,
-                3867,
-                3868,
-                3869,
-                3870,
-                3871,
-                3872,
-                3873,
-                3874,
-                3875,
-                3876,
-                3877,
-                3878,
-                3879,
-                3880,
-                3881,
-                3882,
-                3883,
-                3884,
-                3885,
-                3886,
-                3887,
-                3888,
-                3889,
-                3890,
-                3891,
-                3892,
-                3893,
-                3894,
-                3895,
-                3896,
-                3897,
-                3898,
-                3899,
-                3900,
-                3901,
-                3902,
-                3903,
-                3904,
-                3905,
-                3906,
-                3907,
-                3908,
-                3909,
-                3910,
-                3911,
-                3912,
-                3913,
-                3914,
-                3915,
-                3916,
-                3917,
-                3918,
-                3919,
-                3920,
-                3921,
-                3922,
-                3923,
-                3924,
-                3925,
-                3926,
-                3927,
-                3928,
-                3929,
-                3930,
-                3931,
-                3932,
-                3933,
-                3934,
-                3935,
-                3936,
-                3937,
-                3938,
-                3939,
-                3940,
-                3941,
-                3942,
-                3943,
-                3944,
-                3945,
-                3946,
-                3947,
-                3948,
-                3949,
-                3950,
-                3951,
-                3952,
-                3953,
-                3954,
-                3955,
-                3956,
-                3957,
-                3958,
-                3959,
-                3960,
-                3961,
-                3962,
-                3963,
-                3964,
-                3965,
-                3966,
-                3967,
-                3968,
-                3969,
-                3970,
-                3971,
-                3972,
-                3973,
-                3974,
-                3975,
-                3976,
-                3977,
-                3978,
-                3979,
-                3980,
-                3981,
-                3982,
-                3983,
-                3984,
-                3985,
-                3986,
-                3987,
-                3988,
-                3989,
-                3990,
-                3991,
-                3992,
-                3993,
-                3994,
-                3995,
-                3996,
-                3997,
-                3998,
-                3999,
-                4000,
-                4001,
-                4002,
-                4003,
-                4004,
-                4005,
-                4006,
-                4007,
-                4008,
-                4009,
-                4010,
-                4011,
-                4012,
-                4013,
-                4014,
-                4015,
-                4016,
-                4017,
-                4018,
-                4019,
-                4020,
-                4021,
-                4022,
-                4023,
-                4024,
-                4025,
-                4026,
-                4027,
-                4028,
-                4029,
-                4030,
-                4031,
-                4032,
-                4033,
-                4034,
-                4035,
-                4036,
-                4037,
-                4038,
-                4039,
-                4040,
-                4041,
-                4042,
-                4043,
-                4044,
-                4045,
-                4046,
-                4047,
-                4048,
-                4049,
-                4050,
-                4051,
-                4052,
-                4053,
-                4054,
-                4055,
-                4056,
-                4057,
-                4058,
-                4059,
-                4060,
-                4061,
-                4062,
-                4063,
-                4064,
-                4065,
-                4066,
-                4067,
-                4068,
-                4069,
-                4070,
-                4071,
-                4072,
-                4073,
-                4074,
-                4075,
-                4076,
-                4077,
-                4078,
-                4079,
-                4080,
-                4081,
-                4082,
-                4083,
-                4084,
-                4085,
-                4086,
-                4087,
-                4088,
-                4089,
-                4090,
-                4091,
-                4092,
-                4093,
-                4094,
-                4095,
-                4096,
-                4097,
-                4098,
-                4099,
-                4100,
-                4101,
-                4102,
-                4103,
-                4104,
-                4105,
-                4106,
-                4107,
-                4108,
-                4109,
-                4110,
-                4111,
-                4112,
-                4113,
-                4114,
-                4115,
-                4116,
-                4117,
-                4118,
-                4119,
-                4120,
-                4121,
-                4122,
-                4123,
-                4124,
-                4125,
-                4126,
-                4127,
-                4128,
-                4129,
-                4130,
-                4131,
-                4132,
-                4133,
-                4134,
-                4135,
-                4136,
-                4137,
-                4138,
-                4139,
-                4140,
-                4141,
-                4142,
-                4143,
-                4144,
-                4145,
-                4146,
-                4147,
-                4148,
-                4149,
-                4150,
-                4151,
-                4152,
-                4153,
-                4154,
-                4155,
-                4156,
-                4157,
-                4158,
-                4159,
-                4160,
-                4161,
-                4162,
-                4163,
-                4164,
-                4165,
-                4166,
-                4167,
-                4168,
-                4169,
-                4170,
-                4171,
-                4172,
-                4173,
-                4174,
-                4175,
-                4176,
-                4177,
-                4178,
-                4179,
-                4180,
-                4181,
-                4182,
-                4183,
-                4184,
-                4185,
-                4186,
-                4187,
-                4188,
-                4189,
-                4190,
-                4191,
-                4192,
-                4193,
-                4194,
-                4195,
-                4196,
-                4197,
-                4198,
-                4199,
-                4200,
-                4201,
-                4202,
-                4203,
-                4204,
-                4205,
-                4206,
-                4207,
-                4208,
-                4209,
-                4210,
-                4211,
-                4212,
-                4213,
-                4214,
-                4215,
-                4216,
-                4217,
-                4218,
-                4219,
-                4220,
-                4221,
-                4222,
-                4223,
-                4224,
-                4225,
-                4226,
-                4227,
-                4228,
-                4229,
-                4230,
-                4231,
-                4232,
-                4233,
-                4234,
-                4235,
-                4236,
-                4237,
-                4238,
-                4239,
-                4240,
-                4241,
-                4242,
-                4243,
-                4244,
-                4245,
-                4246,
-                4247,
-                4248,
-                4249,
-                4250,
-                4251,
-                4252,
-                4253,
-                4254,
-                4255,
-                4256,
-                4257,
-                4258,
-                4259,
-                4260,
-                4261,
-                4262,
-                4263,
-                4264,
-                4265,
-                4266,
-                4267,
-                4268,
-                4269,
-                4270,
-                4271,
-                4272,
-                4273,
-                4274,
-                4275,
-                4276,
-                4277,
-                4278,
-                4279,
-                4280,
-                4281,
-                4282,
-                4283,
-                4284,
-                4285,
-                4286,
-                4287,
-                4288,
-                4289,
-                4290,
-                4291,
-                4292,
-                4293,
-                4294,
-                4295,
-                4296,
-                4297,
-                4298,
-                4299,
-                4300,
-                4301
+                8000,
+                9000,
+                10000,
+                11000,
+                12000,
+                13000,
+                14000,
+                15000,
+                16000,
+                17000,
+                18000,
+                19000,
+                20000,
+                21000,
+                22000,
+                23000,
+                24000,
+                25000,
+                26000,
+                27000,
+                28000,
+                29000,
+                30000,
+                31000,
+                32000,
+                33000,
+                34000,
+                35000,
+                36000,
+                37000,
+                38000,
+                39000,
+                40000,
+                41000,
+                42000,
+                43000,
+                44000,
+                45000,
+                46000,
+                47000,
+                48000,
+                49000,
+                50000,
+                51000,
+                52000,
+                53000,
+                54000,
+                55000,
+                56000,
+                57000,
+                58000,
+                59000,
+                60000,
+                61000,
+                62000,
+                63000,
+                64000,
+                65000,
+                66000,
+                67000,
+                68000,
+                69000,
+                70000,
+                71000,
+                72000,
+                73000,
+                74000,
+                75000,
+                76000,
+                77000,
+                78000,
+                79000,
+                80000,
+                81000,
+                82000,
+                83000,
+                84000,
+                85000,
+                86000,
+                87000,
+                88000,
+                89000,
+                90000,
+                91000,
+                92000,
+                93000,
+                94000,
+                95000,
+                96000,
+                97000,
+                98000,
+                99000,
+                100000,
+                101000,
+                102000,
+                103000,
+                104000,
+                105000,
+                106000,
+                107000,
+                108000,
+                109000,
+                110000,
+                111000,
+                112000,
+                113000,
+                114000,
+                115000,
+                116000,
+                117000,
+                118000,
+                119000,
+                120000,
+                121000,
+                122000,
+                123000,
+                124000,
+                125000,
+                126000,
+                127000,
+                128000,
+                129000,
+                130000,
+                131000,
+                132000,
+                133000,
+                134000,
+                135000,
+                136000,
+                137000,
+                138000,
+                139000,
+                140000,
+                141000,
+                142000,
+                143000,
+                144000,
+                145000,
+                146000,
+                147000,
+                148000,
+                149000,
+                150000,
+                151000,
+                152000,
+                153000,
+                154000,
+                155000,
+                156000,
+                157000,
+                158000,
+                159000,
+                160000,
+                161000,
+                162000,
+                163000,
+                164000,
+                165000,
+                166000,
+                167000,
+                168000,
+                169000,
+                170000,
+                171000,
+                172000,
+                173000,
+                174000,
+                175000,
+                176000,
+                177000,
+                178000,
+                179000,
+                180000,
+                181000,
+                182000,
+                183000,
+                184000,
+                185000,
+                186000,
+                187000,
+                188000,
+                189000,
+                190000,
+                191000,
+                192000,
+                193000,
+                194000,
+                195000,
+                196000,
+                197000,
+                198000,
+                199000,
+                200000,
+                201000,
+                202000,
+                203000,
+                204000,
+                205000,
+                206000,
+                207000,
+                208000,
+                209000,
+                210000,
+                211000,
+                212000,
+                213000,
+                214000,
+                215000,
+                216000,
+                217000,
+                218000,
+                219000,
+                220000,
+                221000,
+                222000,
+                223000,
+                224000,
+                225000,
+                226000,
+                227000,
+                228000,
+                229000,
+                230000,
+                231000,
+                232000,
+                233000,
+                234000,
+                235000,
+                236000,
+                237000,
+                238000,
+                239000,
+                240000,
+                241000,
+                242000,
+                243000,
+                244000,
+                245000,
+                246000,
+                247000,
+                248000,
+                249000,
+                250000,
+                251000,
+                252000,
+                253000,
+                254000,
+                255000,
+                256000,
+                257000,
+                258000,
+                259000,
+                260000,
+                261000,
+                262000,
+                263000,
+                264000,
+                265000,
+                266000,
+                267000,
+                268000,
+                269000,
+                270000,
+                271000,
+                272000,
+                273000,
+                274000,
+                275000,
+                276000,
+                277000,
+                278000,
+                279000,
+                280000,
+                281000,
+                282000,
+                283000,
+                284000,
+                285000,
+                286000,
+                287000,
+                288000,
+                289000,
+                290000,
+                291000,
+                292000,
+                293000,
+                294000,
+                295000,
+                296000,
+                297000,
+                298000,
+                299000,
+                300000,
+                301000,
+                302000,
+                303000,
+                304000,
+                305000,
+                306000,
+                307000,
+                308000,
+                309000,
+                310000,
+                311000,
+                312000,
+                313000,
+                314000,
+                315000,
+                316000,
+                317000,
+                318000,
+                319000,
+                320000,
+                321000,
+                322000,
+                323000,
+                324000,
+                325000,
+                326000,
+                327000,
+                328000,
+                329000,
+                330000,
+                331000,
+                332000,
+                333000,
+                334000,
+                335000,
+                336000,
+                337000,
+                338000,
+                339000,
+                340000,
+                341000,
+                342000,
+                343000,
+                344000,
+                345000,
+                346000,
+                347000,
+                348000,
+                349000,
+                350000,
+                351000,
+                352000,
+                353000,
+                354000,
+                355000,
+                356000,
+                357000,
+                358000,
+                359000,
+                360000,
+                361000,
+                362000,
+                363000,
+                364000,
+                365000,
+                366000,
+                367000,
+                368000,
+                369000,
+                370000,
+                371000,
+                372000,
+                373000,
+                374000,
+                375000,
+                376000,
+                377000,
+                378000,
+                379000,
+                380000,
+                381000,
+                382000,
+                383000,
+                384000,
+                385000,
+                386000,
+                387000,
+                388000,
+                389000,
+                390000,
+                391000,
+                392000,
+                393000,
+                394000,
+                395000,
+                396000,
+                397000,
+                398000,
+                399000,
+                400000,
+                401000,
+                402000,
+                403000,
+                404000,
+                405000,
+                406000,
+                407000,
+                408000,
+                409000,
+                410000,
+                411000,
+                412000,
+                413000,
+                414000,
+                415000,
+                416000,
+                417000,
+                418000,
+                419000,
+                420000,
+                421000,
+                422000,
+                423000,
+                424000,
+                425000,
+                426000,
+                427000,
+                428000,
+                429000,
+                430000,
+                431000,
+                432000,
+                433000,
+                434000,
+                435000,
+                436000,
+                437000,
+                438000,
+                439000,
+                440000,
+                441000,
+                442000,
+                443000,
+                444000,
+                445000,
+                446000,
+                447000,
+                448000,
+                449000,
+                450000,
+                451000,
+                452000,
+                453000,
+                454000,
+                455000,
+                456000,
+                457000,
+                458000,
+                459000,
+                460000,
+                461000,
+                462000,
+                463000,
+                464000,
+                465000,
+                466000,
+                467000,
+                468000,
+                469000,
+                470000,
+                471000,
+                472000,
+                473000,
+                474000,
+                475000,
+                476000,
+                477000,
+                478000,
+                479000,
+                480000,
+                481000,
+                482000,
+                483000,
+                484000,
+                485000,
+                486000,
+                487000,
+                488000,
+                489000,
+                490000,
+                491000,
+                492000,
+                493000,
+                494000,
+                495000,
+                496000,
+                497000,
+                498000,
+                499000,
+                500000,
+                501000,
+                502000,
+                503000,
+                504000,
+                505000,
+                506000,
+                507000,
+                508000,
+                509000,
+                510000,
+                511000,
+                512000,
+                513000,
+                514000,
+                515000,
+                516000,
+                517000,
+                518000,
+                519000,
+                520000,
+                521000,
+                522000,
+                523000,
+                524000,
+                525000,
+                526000,
+                527000,
+                528000,
+                529000,
+                530000,
+                531000,
+                532000,
+                533000,
+                534000,
+                535000,
+                536000,
+                537000,
+                538000,
+                539000,
+                540000,
+                541000,
+                542000,
+                543000,
+                544000,
+                545000,
+                546000,
+                547000,
+                548000,
+                549000,
+                550000,
+                551000,
+                552000,
+                553000,
+                554000,
+                555000,
+                556000,
+                557000,
+                558000,
+                559000,
+                560000,
+                561000,
+                562000,
+                563000,
+                564000,
+                565000,
+                566000,
+                567000,
+                568000,
+                569000,
+                570000,
+                571000,
+                572000,
+                573000,
+                574000,
+                575000,
+                576000,
+                577000,
+                578000,
+                579000,
+                580000,
+                581000,
+                582000,
+                583000,
+                584000,
+                585000,
+                586000,
+                587000,
+                588000,
+                589000,
+                590000,
+                591000,
+                592000,
+                593000,
+                594000,
+                595000,
+                596000,
+                597000,
+                598000,
+                599000,
+                600000,
+                601000,
+                602000,
+                603000,
+                604000,
+                605000,
+                606000,
+                607000,
+                608000,
+                609000,
+                610000,
+                611000,
+                612000,
+                613000,
+                614000,
+                615000,
+                616000,
+                617000,
+                618000,
+                619000,
+                620000,
+                621000,
+                622000,
+                623000,
+                624000,
+                625000,
+                626000,
+                627000,
+                628000,
+                629000,
+                630000,
+                631000,
+                632000,
+                633000,
+                634000,
+                635000,
+                636000,
+                637000,
+                638000,
+                639000,
+                640000,
+                641000,
+                642000,
+                643000,
+                644000,
+                645000,
+                646000,
+                647000,
+                648000,
+                649000,
+                650000,
+                651000,
+                652000,
+                653000,
+                654000,
+                655000,
+                656000,
+                657000,
+                658000,
+                659000,
+                660000,
+                661000,
+                662000,
+                663000,
+                664000,
+                665000,
+                666000,
+                667000,
+                668000,
+                669000,
+                670000,
+                671000,
+                672000,
+                673000,
+                674000,
+                675000,
+                676000,
+                677000,
+                678000,
+                679000,
+                680000,
+                681000,
+                682000,
+                683000,
+                684000,
+                685000,
+                686000,
+                687000,
+                688000,
+                689000,
+                690000,
+                691000,
+                692000,
+                693000,
+                694000,
+                695000,
+                696000,
+                697000,
+                698000,
+                699000,
+                700000,
+                701000,
+                702000,
+                703000,
+                704000,
+                705000,
+                706000,
+                707000,
+                708000,
+                709000,
+                710000,
+                711000,
+                712000,
+                713000,
+                714000,
+                715000,
+                716000,
+                717000,
+                718000,
+                719000,
+                720000,
+                721000,
+                722000,
+                723000,
+                724000,
+                725000,
+                726000,
+                727000,
+                728000,
+                729000,
+                730000,
+                731000,
+                732000,
+                733000,
+                734000,
+                735000,
+                736000,
+                737000,
+                738000,
+                739000,
+                740000,
+                741000,
+                742000,
+                743000,
+                744000,
+                745000,
+                746000,
+                747000,
+                748000,
+                749000,
+                750000,
+                751000,
+                752000,
+                753000,
+                754000,
+                755000,
+                756000,
+                757000,
+                758000,
+                759000,
+                760000,
+                761000,
+                762000,
+                763000,
+                764000,
+                765000,
+                766000,
+                767000,
+                768000,
+                769000,
+                770000,
+                771000,
+                772000,
+                773000,
+                774000,
+                775000,
+                776000,
+                777000,
+                778000,
+                779000,
+                780000,
+                781000,
+                782000,
+                783000,
+                784000,
+                785000,
+                786000,
+                787000,
+                788000,
+                789000,
+                790000,
+                791000,
+                792000,
+                793000,
+                794000,
+                795000,
+                796000,
+                797000,
+                798000,
+                799000,
+                800000,
+                801000,
+                802000,
+                803000,
+                804000,
+                805000,
+                806000,
+                807000,
+                808000,
+                809000,
+                810000,
+                811000,
+                812000,
+                813000,
+                814000,
+                815000,
+                816000,
+                817000,
+                818000,
+                819000,
+                820000,
+                821000,
+                822000,
+                823000,
+                824000,
+                825000,
+                826000,
+                827000,
+                828000,
+                829000,
+                830000,
+                831000,
+                832000,
+                833000,
+                834000,
+                835000,
+                836000,
+                837000,
+                838000,
+                839000,
+                840000,
+                841000,
+                842000,
+                843000,
+                844000,
+                845000,
+                846000,
+                847000,
+                848000,
+                849000,
+                850000,
+                851000,
+                852000,
+                853000,
+                854000,
+                855000,
+                856000,
+                857000,
+                858000,
+                859000,
+                860000,
+                861000,
+                862000,
+                863000,
+                864000,
+                865000,
+                866000,
+                867000,
+                868000,
+                869000,
+                870000,
+                871000,
+                872000,
+                873000,
+                874000,
+                875000,
+                876000,
+                877000,
+                878000,
+                879000,
+                880000,
+                881000,
+                882000,
+                883000,
+                884000,
+                885000,
+                886000,
+                887000,
+                888000,
+                889000,
+                890000,
+                891000,
+                892000,
+                893000,
+                894000,
+                895000,
+                896000,
+                897000,
+                898000,
+                899000,
+                900000,
+                901000,
+                902000,
+                903000,
+                904000,
+                905000,
+                906000,
+                907000,
+                908000,
+                909000,
+                910000,
+                911000,
+                912000,
+                913000,
+                914000,
+                915000,
+                916000,
+                917000,
+                918000,
+                919000,
+                920000,
+                921000,
+                922000,
+                923000,
+                924000,
+                925000,
+                926000,
+                927000,
+                928000,
+                929000,
+                930000,
+                931000,
+                932000,
+                933000,
+                934000,
+                935000,
+                936000,
+                937000,
+                938000,
+                939000,
+                940000,
+                941000,
+                942000,
+                943000,
+                944000,
+                945000,
+                946000,
+                947000,
+                948000,
+                949000,
+                950000,
+                951000,
+                952000,
+                953000,
+                954000,
+                955000,
+                956000,
+                957000,
+                958000,
+                959000,
+                960000,
+                961000,
+                962000,
+                963000,
+                964000,
+                965000,
+                966000,
+                967000,
+                968000,
+                969000,
+                970000,
+                971000,
+                972000,
+                973000,
+                974000,
+                975000,
+                976000,
+                977000,
+                978000,
+                979000,
+                980000,
+                981000,
+                982000,
+                983000,
+                984000,
+                985000,
+                986000,
+                987000,
+                988000,
+                989000,
+                990000,
+                991000,
+                992000,
+                993000,
+                994000,
+                995000,
+                996000,
+                997000,
+                998000,
+                999000,
+                1000000,
+                1001000,
+                1002000,
+                1003000,
+                1004000,
+                1005000,
+                1006000,
+                1007000,
+                1008000,
+                1009000,
+                1010000,
+                1011000,
+                1012000,
+                1013000,
+                1014000,
+                1015000,
+                1016000,
+                1017000,
+                1018000,
+                1019000,
+                1020000,
+                1021000,
+                1022000,
+                1023000,
+                1024000,
+                1025000,
+                1026000,
+                1027000,
+                1028000,
+                1029000,
+                1030000,
+                1031000,
+                1032000,
+                1033000,
+                1034000,
+                1035000,
+                1036000,
+                1037000,
+                1038000,
+                1039000,
+                1040000,
+                1041000,
+                1042000,
+                1043000,
+                1044000,
+                1045000,
+                1046000,
+                1047000,
+                1048000,
+                1049000,
+                1050000,
+                1051000,
+                1052000,
+                1053000,
+                1054000,
+                1055000,
+                1056000,
+                1057000,
+                1058000,
+                1059000,
+                1060000,
+                1061000,
+                1062000,
+                1063000,
+                1064000,
+                1065000,
+                1066000,
+                1067000,
+                1068000,
+                1069000,
+                1070000,
+                1071000,
+                1072000,
+                1073000,
+                1074000,
+                1075000,
+                1076000,
+                1077000,
+                1078000,
+                1079000,
+                1080000,
+                1081000,
+                1082000,
+                1083000,
+                1084000,
+                1085000,
+                1086000,
+                1087000,
+                1088000,
+                1089000,
+                1090000,
+                1091000,
+                1092000,
+                1093000,
+                1094000,
+                1095000,
+                1096000,
+                1097000,
+                1098000,
+                1099000,
+                1100000,
+                1101000,
+                1102000,
+                1103000,
+                1104000,
+                1105000,
+                1106000,
+                1107000,
+                1108000,
+                1109000,
+                1110000,
+                1111000,
+                1112000,
+                1113000,
+                1114000,
+                1115000,
+                1116000,
+                1117000,
+                1118000,
+                1119000,
+                1120000,
+                1121000,
+                1122000,
+                1123000,
+                1124000,
+                1125000,
+                1126000,
+                1127000,
+                1128000,
+                1129000,
+                1130000,
+                1131000,
+                1132000,
+                1133000,
+                1134000,
+                1135000,
+                1136000,
+                1137000,
+                1138000,
+                1139000,
+                1140000,
+                1141000,
+                1142000,
+                1143000,
+                1144000,
+                1145000,
+                1146000,
+                1147000,
+                1148000,
+                1149000,
+                1150000,
+                1151000,
+                1152000,
+                1153000,
+                1154000,
+                1155000,
+                1156000,
+                1157000,
+                1158000,
+                1159000,
+                1160000,
+                1161000,
+                1162000,
+                1163000,
+                1164000,
+                1165000,
+                1166000,
+                1167000,
+                1168000,
+                1169000,
+                1170000,
+                1171000,
+                1172000,
+                1173000,
+                1174000,
+                1175000,
+                1176000,
+                1177000,
+                1178000,
+                1179000,
+                1180000,
+                1181000,
+                1182000,
+                1183000,
+                1184000,
+                1185000,
+                1186000,
+                1187000,
+                1188000,
+                1189000,
+                1190000,
+                1191000,
+                1192000,
+                1193000,
+                1194000,
+                1195000,
+                1196000,
+                1197000,
+                1198000,
+                1199000,
+                1200000,
+                1201000,
+                1202000,
+                1203000,
+                1204000,
+                1205000,
+                1206000,
+                1207000,
+                1208000,
+                1209000,
+                1210000,
+                1211000,
+                1212000,
+                1213000,
+                1214000,
+                1215000,
+                1216000,
+                1217000,
+                1218000,
+                1219000,
+                1220000,
+                1221000,
+                1222000,
+                1223000,
+                1224000,
+                1225000,
+                1226000,
+                1227000,
+                1228000,
+                1229000,
+                1230000,
+                1231000,
+                1232000,
+                1233000,
+                1234000,
+                1235000,
+                1236000,
+                1237000,
+                1238000,
+                1239000,
+                1240000,
+                1241000,
+                1242000,
+                1243000,
+                1244000,
+                1245000,
+                1246000,
+                1247000,
+                1248000,
+                1249000,
+                1250000,
+                1251000,
+                1252000,
+                1253000,
+                1254000,
+                1255000,
+                1256000,
+                1257000,
+                1258000,
+                1259000,
+                1260000,
+                1261000,
+                1262000,
+                1263000,
+                1264000,
+                1265000,
+                1266000,
+                1267000,
+                1268000,
+                1269000,
+                1270000,
+                1271000,
+                1272000,
+                1273000,
+                1274000,
+                1275000,
+                1276000,
+                1277000,
+                1278000,
+                1279000,
+                1280000,
+                1281000,
+                1282000,
+                1283000,
+                1284000,
+                1285000,
+                1286000,
+                1287000,
+                1288000,
+                1289000,
+                1290000,
+                1291000,
+                1292000,
+                1293000,
+                1294000,
+                1295000,
+                1296000,
+                1297000,
+                1298000,
+                1299000,
+                1300000,
+                1301000,
+                1302000,
+                1303000,
+                1304000,
+                1305000,
+                1306000,
+                1307000,
+                1308000,
+                1309000,
+                1310000,
+                1311000,
+                1312000,
+                1313000,
+                1314000,
+                1315000,
+                1316000,
+                1317000,
+                1318000,
+                1319000,
+                1320000,
+                1321000,
+                1322000,
+                1323000,
+                1324000,
+                1325000,
+                1326000,
+                1327000,
+                1328000,
+                1329000,
+                1330000,
+                1331000,
+                1332000,
+                1333000,
+                1334000,
+                1335000,
+                1336000,
+                1337000,
+                1338000,
+                1339000,
+                1340000,
+                1341000,
+                1342000,
+                1343000,
+                1344000,
+                1345000,
+                1346000,
+                1347000,
+                1348000,
+                1349000,
+                1350000,
+                1351000,
+                1352000,
+                1353000,
+                1354000,
+                1355000,
+                1356000,
+                1357000,
+                1358000,
+                1359000,
+                1360000,
+                1361000,
+                1362000,
+                1363000,
+                1364000,
+                1365000,
+                1366000,
+                1367000,
+                1368000,
+                1369000,
+                1370000,
+                1371000,
+                1372000,
+                1373000,
+                1374000,
+                1375000,
+                1376000,
+                1377000,
+                1378000,
+                1379000,
+                1380000,
+                1381000,
+                1382000,
+                1383000,
+                1384000,
+                1385000,
+                1386000,
+                1387000,
+                1388000,
+                1389000,
+                1390000,
+                1391000,
+                1392000,
+                1393000,
+                1394000,
+                1395000,
+                1396000,
+                1397000,
+                1398000,
+                1399000,
+                1400000,
+                1401000,
+                1402000,
+                1403000,
+                1404000,
+                1405000,
+                1406000,
+                1407000,
+                1408000,
+                1409000,
+                1410000,
+                1411000,
+                1412000,
+                1413000,
+                1414000,
+                1415000,
+                1416000,
+                1417000,
+                1418000,
+                1419000,
+                1420000,
+                1421000,
+                1422000,
+                1423000,
+                1424000,
+                1425000,
+                1426000,
+                1427000,
+                1428000,
+                1429000,
+                1430000,
+                1431000,
+                1432000,
+                1433000,
+                1434000,
+                1435000,
+                1436000,
+                1437000,
+                1438000,
+                1439000,
+                1440000,
+                1441000,
+                1442000,
+                1443000,
+                1444000,
+                1445000,
+                1446000,
+                1447000,
+                1448000,
+                1449000,
+                1450000,
+                1451000,
+                1452000,
+                1453000,
+                1454000,
+                1455000,
+                1456000,
+                1457000,
+                1458000,
+                1459000,
+                1460000,
+                1461000,
+                1462000,
+                1463000,
+                1464000,
+                1465000,
+                1466000,
+                1467000,
+                1468000,
+                1469000,
+                1470000,
+                1471000,
+                1472000,
+                1473000,
+                1474000,
+                1475000,
+                1476000,
+                1477000,
+                1478000,
+                1479000,
+                1480000,
+                1481000,
+                1482000,
+                1483000,
+                1484000,
+                1485000,
+                1486000,
+                1487000,
+                1488000,
+                1489000,
+                1490000,
+                1491000,
+                1492000,
+                1493000,
+                1494000,
+                1495000,
+                1496000,
+                1497000,
+                1498000,
+                1499000,
+                1500000,
+                1501000,
+                1502000,
+                1503000,
+                1504000,
+                1505000,
+                1506000,
+                1507000,
+                1508000,
+                1509000,
+                1510000,
+                1511000,
+                1512000,
+                1513000,
+                1514000,
+                1515000,
+                1516000,
+                1517000,
+                1518000,
+                1519000,
+                1520000,
+                1521000,
+                1522000,
+                1523000,
+                1524000,
+                1525000,
+                1526000,
+                1527000,
+                1528000,
+                1529000,
+                1530000,
+                1531000,
+                1532000,
+                1533000,
+                1534000,
+                1535000,
+                1536000,
+                1537000,
+                1538000,
+                1539000,
+                1540000,
+                1541000,
+                1542000,
+                1543000,
+                1544000,
+                1545000,
+                1546000,
+                1547000,
+                1548000,
+                1549000,
+                1550000,
+                1551000,
+                1552000,
+                1553000,
+                1554000,
+                1555000,
+                1556000,
+                1557000,
+                1558000,
+                1559000,
+                1560000,
+                1561000,
+                1562000,
+                1563000,
+                1564000,
+                1565000,
+                1566000,
+                1567000,
+                1568000,
+                1569000,
+                1570000,
+                1571000,
+                1572000,
+                1573000,
+                1574000,
+                1575000,
+                1576000,
+                1577000,
+                1578000,
+                1579000,
+                1580000,
+                1581000,
+                1582000,
+                1583000,
+                1584000,
+                1585000,
+                1586000,
+                1587000,
+                1588000,
+                1589000,
+                1590000,
+                1591000,
+                1592000,
+                1593000,
+                1594000,
+                1595000,
+                1596000,
+                1597000,
+                1598000,
+                1599000,
+                1600000,
+                1601000,
+                1602000,
+                1603000,
+                1604000,
+                1605000,
+                1606000,
+                1607000,
+                1608000,
+                1609000,
+                1610000,
+                1611000,
+                1612000,
+                1613000,
+                1614000,
+                1615000,
+                1616000,
+                1617000,
+                1618000,
+                1619000,
+                1620000,
+                1621000,
+                1622000,
+                1623000,
+                1624000,
+                1625000,
+                1626000,
+                1627000,
+                1628000,
+                1629000,
+                1630000,
+                1631000,
+                1632000,
+                1633000,
+                1634000,
+                1635000,
+                1636000,
+                1637000,
+                1638000,
+                1639000,
+                1640000,
+                1641000,
+                1642000,
+                1643000,
+                1644000,
+                1645000,
+                1646000,
+                1647000,
+                1648000,
+                1649000,
+                1650000,
+                1651000,
+                1652000,
+                1653000,
+                1654000,
+                1655000,
+                1656000,
+                1657000,
+                1658000,
+                1659000,
+                1660000,
+                1661000,
+                1662000,
+                1663000,
+                1664000,
+                1665000,
+                1666000,
+                1667000,
+                1668000,
+                1669000,
+                1670000,
+                1671000,
+                1672000,
+                1673000,
+                1674000,
+                1675000,
+                1676000,
+                1677000,
+                1678000,
+                1679000,
+                1680000,
+                1681000,
+                1682000,
+                1683000,
+                1684000,
+                1685000,
+                1686000,
+                1687000,
+                1688000,
+                1689000,
+                1690000,
+                1691000,
+                1692000,
+                1693000,
+                1694000,
+                1695000,
+                1696000,
+                1697000,
+                1698000,
+                1699000,
+                1700000,
+                1701000,
+                1702000,
+                1703000,
+                1704000,
+                1705000,
+                1706000,
+                1707000,
+                1708000,
+                1709000,
+                1710000,
+                1711000,
+                1712000,
+                1713000,
+                1714000,
+                1715000,
+                1716000,
+                1717000,
+                1718000,
+                1719000,
+                1720000,
+                1721000,
+                1722000,
+                1723000,
+                1724000,
+                1725000,
+                1726000,
+                1727000,
+                1728000,
+                1729000,
+                1730000,
+                1731000,
+                1732000,
+                1733000,
+                1734000,
+                1735000,
+                1736000,
+                1737000,
+                1738000,
+                1739000,
+                1740000,
+                1741000,
+                1742000,
+                1743000,
+                1744000,
+                1745000,
+                1746000,
+                1747000,
+                1748000,
+                1749000,
+                1750000,
+                1751000,
+                1752000,
+                1753000,
+                1754000,
+                1755000,
+                1756000,
+                1757000,
+                1758000,
+                1759000,
+                1760000,
+                1761000,
+                1762000,
+                1763000,
+                1764000,
+                1765000,
+                1766000,
+                1767000,
+                1768000,
+                1769000,
+                1770000,
+                1771000,
+                1772000,
+                1773000,
+                1774000,
+                1775000,
+                1776000,
+                1777000,
+                1778000,
+                1779000,
+                1780000,
+                1781000,
+                1782000,
+                1783000,
+                1784000,
+                1785000,
+                1786000,
+                1787000,
+                1788000,
+                1789000,
+                1790000,
+                1791000,
+                1792000,
+                1793000,
+                1794000,
+                1795000,
+                1796000,
+                1797000,
+                1798000,
+                1799000,
+                1800000,
+                1801000,
+                1802000,
+                1803000,
+                1804000,
+                1805000,
+                1806000,
+                1807000,
+                1808000,
+                1809000,
+                1810000,
+                1811000,
+                1812000,
+                1813000,
+                1814000,
+                1815000,
+                1816000,
+                1817000,
+                1818000,
+                1819000,
+                1820000,
+                1821000,
+                1822000,
+                1823000,
+                1824000,
+                1825000,
+                1826000,
+                1827000,
+                1828000,
+                1829000,
+                1830000,
+                1831000,
+                1832000,
+                1833000,
+                1834000,
+                1835000,
+                1836000,
+                1837000,
+                1838000,
+                1839000,
+                1840000,
+                1841000,
+                1842000,
+                1843000,
+                1844000,
+                1845000,
+                1846000,
+                1847000,
+                1848000,
+                1849000,
+                1850000,
+                1851000,
+                1852000,
+                1853000,
+                1854000,
+                1855000,
+                1856000,
+                1857000,
+                1858000,
+                1859000,
+                1860000,
+                1861000,
+                1862000,
+                1863000,
+                1864000,
+                1865000,
+                1866000,
+                1867000,
+                1868000,
+                1869000,
+                1870000,
+                1871000,
+                1872000,
+                1873000,
+                1874000,
+                1875000,
+                1876000,
+                1877000,
+                1878000,
+                1879000,
+                1880000,
+                1881000,
+                1882000,
+                1883000,
+                1884000,
+                1885000,
+                1886000,
+                1887000,
+                1888000,
+                1889000,
+                1890000,
+                1891000,
+                1892000,
+                1893000,
+                1894000,
+                1895000,
+                1896000,
+                1897000,
+                1898000,
+                1899000,
+                1900000,
+                1901000,
+                1902000,
+                1903000,
+                1904000,
+                1905000,
+                1906000,
+                1907000,
+                1908000,
+                1909000,
+                1910000,
+                1911000,
+                1912000,
+                1913000,
+                1914000,
+                1915000,
+                1916000,
+                1917000,
+                1918000,
+                1919000,
+                1920000,
+                1921000,
+                1922000,
+                1923000,
+                1924000,
+                1925000,
+                1926000,
+                1927000,
+                1928000,
+                1929000,
+                1930000,
+                1931000,
+                1932000,
+                1933000,
+                1934000,
+                1935000,
+                1936000,
+                1937000,
+                1938000,
+                1939000,
+                1940000,
+                1941000,
+                1942000,
+                1943000,
+                1944000,
+                1945000,
+                1946000,
+                1947000,
+                1948000,
+                1949000,
+                1950000,
+                1951000,
+                1952000,
+                1953000,
+                1954000,
+                1955000,
+                1956000,
+                1957000,
+                1958000,
+                1959000,
+                1960000,
+                1961000,
+                1962000,
+                1963000,
+                1964000,
+                1965000,
+                1966000,
+                1967000,
+                1968000,
+                1969000,
+                1970000,
+                1971000,
+                1972000,
+                1973000,
+                1974000,
+                1975000,
+                1976000,
+                1977000,
+                1978000,
+                1979000,
+                1980000,
+                1981000,
+                1982000,
+                1983000,
+                1984000,
+                1985000,
+                1986000,
+                1987000,
+                1988000,
+                1989000,
+                1990000,
+                1991000,
+                1992000,
+                1993000,
+                1994000,
+                1995000,
+                1996000,
+                1997000,
+                1998000,
+                1999000,
+                2000000,
+                2001000,
+                2002000,
+                2003000,
+                2004000,
+                2005000,
+                2006000,
+                2007000,
+                2008000,
+                2009000,
+                2010000,
+                2011000,
+                2012000,
+                2013000,
+                2014000,
+                2015000,
+                2016000,
+                2017000,
+                2018000,
+                2019000,
+                2020000,
+                2021000,
+                2022000,
+                2023000,
+                2024000,
+                2025000,
+                2026000,
+                2027000,
+                2028000,
+                2029000,
+                2030000,
+                2031000,
+                2032000,
+                2033000,
+                2034000,
+                2035000,
+                2036000,
+                2037000,
+                2038000,
+                2039000,
+                2040000,
+                2041000,
+                2042000,
+                2043000,
+                2044000,
+                2045000,
+                2046000,
+                2047000,
+                2048000,
+                2049000,
+                2050000,
+                2051000,
+                2052000,
+                2053000,
+                2054000,
+                2055000,
+                2056000,
+                2057000,
+                2058000,
+                2059000,
+                2060000,
+                2061000,
+                2062000,
+                2063000,
+                2064000,
+                2065000,
+                2066000,
+                2067000,
+                2068000,
+                2069000,
+                2070000,
+                2071000,
+                2072000,
+                2073000,
+                2074000,
+                2075000,
+                2076000,
+                2077000,
+                2078000,
+                2079000,
+                2080000,
+                2081000,
+                2082000,
+                2083000,
+                2084000,
+                2085000,
+                2086000,
+                2087000,
+                2088000,
+                2089000,
+                2090000,
+                2091000,
+                2092000,
+                2093000,
+                2094000,
+                2095000,
+                2096000,
+                2097000,
+                2098000,
+                2099000,
+                2100000,
+                2101000,
+                2102000,
+                2103000,
+                2104000,
+                2105000,
+                2106000,
+                2107000,
+                2108000,
+                2109000,
+                2110000,
+                2111000,
+                2112000,
+                2113000,
+                2114000,
+                2115000,
+                2116000,
+                2117000,
+                2118000,
+                2119000,
+                2120000,
+                2121000,
+                2122000,
+                2123000,
+                2124000,
+                2125000,
+                2126000,
+                2127000,
+                2128000,
+                2129000,
+                2130000,
+                2131000,
+                2132000,
+                2133000,
+                2134000,
+                2135000,
+                2136000,
+                2137000,
+                2138000,
+                2139000,
+                2140000,
+                2141000,
+                2142000,
+                2143000,
+                2144000,
+                2145000,
+                2146000,
+                2147000,
+                2148000,
+                2149000,
+                2150000,
+                2151000,
+                2152000,
+                2153000,
+                2154000,
+                2155000,
+                2156000,
+                2157000,
+                2158000,
+                2159000,
+                2160000,
+                2161000,
+                2162000,
+                2163000,
+                2164000,
+                2165000,
+                2166000,
+                2167000,
+                2168000,
+                2169000,
+                2170000,
+                2171000,
+                2172000,
+                2173000,
+                2174000,
+                2175000,
+                2176000,
+                2177000,
+                2178000,
+                2179000,
+                2180000,
+                2181000,
+                2182000,
+                2183000,
+                2184000,
+                2185000,
+                2186000,
+                2187000,
+                2188000,
+                2189000,
+                2190000,
+                2191000,
+                2192000,
+                2193000,
+                2194000,
+                2195000,
+                2196000,
+                2197000,
+                2198000,
+                2199000,
+                2200000,
+                2201000,
+                2202000,
+                2203000,
+                2204000,
+                2205000,
+                2206000,
+                2207000,
+                2208000,
+                2209000,
+                2210000,
+                2211000,
+                2212000,
+                2213000,
+                2214000,
+                2215000,
+                2216000,
+                2217000,
+                2218000,
+                2219000,
+                2220000,
+                2221000,
+                2222000,
+                2223000,
+                2224000,
+                2225000,
+                2226000,
+                2227000,
+                2228000,
+                2229000,
+                2230000,
+                2231000,
+                2232000,
+                2233000,
+                2234000,
+                2235000,
+                2236000,
+                2237000,
+                2238000,
+                2239000,
+                2240000,
+                2241000,
+                2242000,
+                2243000,
+                2244000,
+                2245000,
+                2246000,
+                2247000,
+                2248000,
+                2249000,
+                2250000,
+                2251000,
+                2252000,
+                2253000,
+                2254000,
+                2255000,
+                2256000,
+                2257000,
+                2258000,
+                2259000,
+                2260000,
+                2261000,
+                2262000,
+                2263000,
+                2264000,
+                2265000,
+                2266000,
+                2267000,
+                2268000,
+                2269000,
+                2270000,
+                2271000,
+                2272000,
+                2273000,
+                2274000,
+                2275000,
+                2276000,
+                2277000,
+                2278000,
+                2279000,
+                2280000,
+                2281000,
+                2282000,
+                2283000,
+                2284000,
+                2285000,
+                2286000,
+                2287000,
+                2288000,
+                2289000,
+                2290000,
+                2291000,
+                2292000,
+                2293000,
+                2294000,
+                2295000,
+                2296000,
+                2297000,
+                2298000,
+                2299000,
+                2300000,
+                2301000,
+                2302000,
+                2303000,
+                2304000,
+                2305000,
+                2306000,
+                2307000,
+                2308000,
+                2309000,
+                2310000,
+                2311000,
+                2312000,
+                2313000,
+                2314000,
+                2315000,
+                2316000,
+                2317000,
+                2318000,
+                2319000,
+                2320000,
+                2321000,
+                2322000,
+                2323000,
+                2324000,
+                2325000,
+                2326000,
+                2327000,
+                2328000,
+                2329000,
+                2330000,
+                2331000,
+                2332000,
+                2333000,
+                2334000,
+                2335000,
+                2336000,
+                2337000,
+                2338000,
+                2339000,
+                2340000,
+                2341000,
+                2342000,
+                2343000,
+                2344000,
+                2345000,
+                2346000,
+                2347000,
+                2348000,
+                2349000,
+                2350000,
+                2351000,
+                2352000,
+                2353000,
+                2354000,
+                2355000,
+                2356000,
+                2357000,
+                2358000,
+                2359000,
+                2360000,
+                2361000,
+                2362000,
+                2363000,
+                2364000,
+                2365000,
+                2366000,
+                2367000,
+                2368000,
+                2369000,
+                2370000,
+                2371000,
+                2372000,
+                2373000,
+                2374000,
+                2375000,
+                2376000,
+                2377000,
+                2378000,
+                2379000,
+                2380000,
+                2381000,
+                2382000,
+                2383000,
+                2384000,
+                2385000,
+                2386000,
+                2387000,
+                2388000,
+                2389000,
+                2390000,
+                2391000,
+                2392000,
+                2393000,
+                2394000,
+                2395000,
+                2396000,
+                2397000,
+                2398000,
+                2399000,
+                2400000,
+                2401000,
+                2402000,
+                2403000,
+                2404000,
+                2405000,
+                2406000,
+                2407000,
+                2408000,
+                2409000,
+                2410000,
+                2411000,
+                2412000,
+                2413000,
+                2414000,
+                2415000,
+                2416000,
+                2417000,
+                2418000,
+                2419000,
+                2420000,
+                2421000,
+                2422000,
+                2423000,
+                2424000,
+                2425000,
+                2426000,
+                2427000,
+                2428000,
+                2429000,
+                2430000,
+                2431000,
+                2432000,
+                2433000,
+                2434000,
+                2435000,
+                2436000,
+                2437000,
+                2438000,
+                2439000,
+                2440000,
+                2441000,
+                2442000,
+                2443000,
+                2444000,
+                2445000,
+                2446000,
+                2447000,
+                2448000,
+                2449000,
+                2450000,
+                2451000,
+                2452000,
+                2453000,
+                2454000,
+                2455000,
+                2456000,
+                2457000,
+                2458000,
+                2459000,
+                2460000,
+                2461000,
+                2462000,
+                2463000,
+                2464000,
+                2465000,
+                2466000,
+                2467000,
+                2468000,
+                2469000,
+                2470000,
+                2471000,
+                2472000,
+                2473000,
+                2474000,
+                2475000,
+                2476000,
+                2477000,
+                2478000,
+                2479000,
+                2480000,
+                2481000,
+                2482000,
+                2483000,
+                2484000,
+                2485000,
+                2486000,
+                2487000,
+                2488000,
+                2489000,
+                2490000,
+                2491000,
+                2492000,
+                2493000,
+                2494000,
+                2495000,
+                2496000,
+                2497000,
+                2498000,
+                2499000,
+                2500000,
+                2501000,
+                2502000,
+                2503000,
+                2504000,
+                2505000,
+                2506000,
+                2507000,
+                2508000,
+                2509000,
+                2510000,
+                2511000,
+                2512000,
+                2513000,
+                2514000,
+                2515000,
+                2516000,
+                2517000,
+                2518000,
+                2519000,
+                2520000,
+                2521000,
+                2522000,
+                2523000,
+                2524000,
+                2525000,
+                2526000,
+                2527000,
+                2528000,
+                2529000,
+                2530000,
+                2531000,
+                2532000,
+                2533000,
+                2534000,
+                2535000,
+                2536000,
+                2537000,
+                2538000,
+                2539000,
+                2540000,
+                2541000,
+                2542000,
+                2543000,
+                2544000,
+                2545000,
+                2546000,
+                2547000,
+                2548000,
+                2549000,
+                2550000,
+                2551000,
+                2552000,
+                2553000,
+                2554000,
+                2555000,
+                2556000,
+                2557000,
+                2558000,
+                2559000,
+                2560000,
+                2561000,
+                2562000,
+                2563000,
+                2564000,
+                2565000,
+                2566000,
+                2567000,
+                2568000,
+                2569000,
+                2570000,
+                2571000,
+                2572000,
+                2573000,
+                2574000,
+                2575000,
+                2576000,
+                2577000,
+                2578000,
+                2579000,
+                2580000,
+                2581000,
+                2582000,
+                2583000,
+                2584000,
+                2585000,
+                2586000,
+                2587000,
+                2588000,
+                2589000,
+                2590000,
+                2591000,
+                2592000,
+                2593000,
+                2594000,
+                2595000,
+                2596000,
+                2597000,
+                2598000,
+                2599000,
+                2600000,
+                2601000,
+                2602000,
+                2603000,
+                2604000,
+                2605000,
+                2606000,
+                2607000,
+                2608000,
+                2609000,
+                2610000,
+                2611000,
+                2612000,
+                2613000,
+                2614000,
+                2615000,
+                2616000,
+                2617000,
+                2618000,
+                2619000,
+                2620000,
+                2621000,
+                2622000,
+                2623000,
+                2624000,
+                2625000,
+                2626000,
+                2627000,
+                2628000,
+                2629000,
+                2630000,
+                2631000,
+                2632000,
+                2633000,
+                2634000,
+                2635000,
+                2636000,
+                2637000,
+                2638000,
+                2639000,
+                2640000,
+                2641000,
+                2642000,
+                2643000,
+                2644000,
+                2645000,
+                2646000,
+                2647000,
+                2648000,
+                2649000,
+                2650000,
+                2651000,
+                2652000,
+                2653000,
+                2654000,
+                2655000,
+                2656000,
+                2657000,
+                2658000,
+                2659000,
+                2660000,
+                2661000,
+                2662000,
+                2663000,
+                2664000,
+                2665000,
+                2666000,
+                2667000,
+                2668000,
+                2669000,
+                2670000,
+                2671000,
+                2672000,
+                2673000,
+                2674000,
+                2675000,
+                2676000,
+                2677000,
+                2678000,
+                2679000,
+                2680000,
+                2681000,
+                2682000,
+                2683000,
+                2684000,
+                2685000,
+                2686000,
+                2687000,
+                2688000,
+                2689000,
+                2690000,
+                2691000,
+                2692000,
+                2693000,
+                2694000,
+                2695000,
+                2696000,
+                2697000,
+                2698000,
+                2699000,
+                2700000,
+                2701000,
+                2702000,
+                2703000,
+                2704000,
+                2705000,
+                2706000,
+                2707000,
+                2708000,
+                2709000,
+                2710000,
+                2711000,
+                2712000,
+                2713000,
+                2714000,
+                2715000,
+                2716000,
+                2717000,
+                2718000,
+                2719000,
+                2720000,
+                2721000,
+                2722000,
+                2723000,
+                2724000,
+                2725000,
+                2726000,
+                2727000,
+                2728000,
+                2729000,
+                2730000,
+                2731000,
+                2732000,
+                2733000,
+                2734000,
+                2735000,
+                2736000,
+                2737000,
+                2738000,
+                2739000,
+                2740000,
+                2741000,
+                2742000,
+                2743000,
+                2744000,
+                2745000,
+                2746000,
+                2747000,
+                2748000,
+                2749000,
+                2750000,
+                2751000,
+                2752000,
+                2753000,
+                2754000,
+                2755000,
+                2756000,
+                2757000,
+                2758000,
+                2759000,
+                2760000,
+                2761000,
+                2762000,
+                2763000,
+                2764000,
+                2765000,
+                2766000,
+                2767000,
+                2768000,
+                2769000,
+                2770000,
+                2771000,
+                2772000,
+                2773000,
+                2774000,
+                2775000,
+                2776000,
+                2777000,
+                2778000,
+                2779000,
+                2780000,
+                2781000,
+                2782000,
+                2783000,
+                2784000,
+                2785000,
+                2786000,
+                2787000,
+                2788000,
+                2789000,
+                2790000,
+                2791000,
+                2792000,
+                2793000,
+                2794000,
+                2795000,
+                2796000,
+                2797000,
+                2798000,
+                2799000,
+                2800000,
+                2801000,
+                2802000,
+                2803000,
+                2804000,
+                2805000,
+                2806000,
+                2807000,
+                2808000,
+                2809000,
+                2810000,
+                2811000,
+                2812000,
+                2813000,
+                2814000,
+                2815000,
+                2816000,
+                2817000,
+                2818000,
+                2819000,
+                2820000,
+                2821000,
+                2822000,
+                2823000,
+                2824000,
+                2825000,
+                2826000,
+                2827000,
+                2828000,
+                2829000,
+                2830000,
+                2831000,
+                2832000,
+                2833000,
+                2834000,
+                2835000,
+                2836000,
+                2837000,
+                2838000,
+                2839000,
+                2840000,
+                2841000,
+                2842000,
+                2843000,
+                2844000,
+                2845000,
+                2846000,
+                2847000,
+                2848000,
+                2849000,
+                2850000,
+                2851000,
+                2852000,
+                2853000,
+                2854000,
+                2855000,
+                2856000,
+                2857000,
+                2858000,
+                2859000,
+                2860000,
+                2861000,
+                2862000,
+                2863000,
+                2864000,
+                2865000,
+                2866000,
+                2867000,
+                2868000,
+                2869000,
+                2870000,
+                2871000,
+                2872000,
+                2873000,
+                2874000,
+                2875000,
+                2876000,
+                2877000,
+                2878000,
+                2879000,
+                2880000,
+                2881000,
+                2882000,
+                2883000,
+                2884000,
+                2885000,
+                2886000,
+                2887000,
+                2888000,
+                2889000,
+                2890000,
+                2891000,
+                2892000,
+                2893000,
+                2894000,
+                2895000,
+                2896000,
+                2897000,
+                2898000,
+                2899000,
+                2900000,
+                2901000,
+                2902000,
+                2903000,
+                2904000,
+                2905000,
+                2906000,
+                2907000,
+                2908000,
+                2909000,
+                2910000,
+                2911000,
+                2912000,
+                2913000,
+                2914000,
+                2915000,
+                2916000,
+                2917000,
+                2918000,
+                2919000,
+                2920000,
+                2921000,
+                2922000,
+                2923000,
+                2924000,
+                2925000,
+                2926000,
+                2927000,
+                2928000,
+                2929000,
+                2930000,
+                2931000,
+                2932000,
+                2933000,
+                2934000,
+                2935000,
+                2936000,
+                2937000,
+                2938000,
+                2939000,
+                2940000,
+                2941000,
+                2942000,
+                2943000,
+                2944000,
+                2945000,
+                2946000,
+                2947000,
+                2948000,
+                2949000,
+                2950000,
+                2951000,
+                2952000,
+                2953000,
+                2954000,
+                2955000,
+                2956000,
+                2957000,
+                2958000,
+                2959000,
+                2960000,
+                2961000,
+                2962000,
+                2963000,
+                2964000,
+                2965000,
+                2966000,
+                2967000,
+                2968000,
+                2969000,
+                2970000,
+                2971000,
+                2972000,
+                2973000,
+                2974000,
+                2975000,
+                2976000,
+                2977000,
+                2978000,
+                2979000,
+                2980000,
+                2981000,
+                2982000,
+                2983000,
+                2984000,
+                2985000,
+                2986000,
+                2987000,
+                2988000,
+                2989000,
+                2990000,
+                2991000,
+                2992000,
+                2993000,
+                2994000,
+                2995000,
+                2996000,
+                2997000,
+                2998000,
+                2999000,
+                3000000,
+                3001000,
+                3002000,
+                3003000,
+                3004000,
+                3005000,
+                3006000,
+                3007000,
+                3008000,
+                3009000,
+                3010000,
+                3011000,
+                3012000,
+                3013000,
+                3014000,
+                3015000,
+                3016000,
+                3017000,
+                3018000,
+                3019000,
+                3020000,
+                3021000,
+                3022000,
+                3023000,
+                3024000,
+                3025000,
+                3026000,
+                3027000,
+                3028000,
+                3029000,
+                3030000,
+                3031000,
+                3032000,
+                3033000,
+                3034000,
+                3035000,
+                3036000,
+                3037000,
+                3038000,
+                3039000,
+                3040000,
+                3041000,
+                3042000,
+                3043000,
+                3044000,
+                3045000,
+                3046000,
+                3047000,
+                3048000,
+                3049000,
+                3050000,
+                3051000,
+                3052000,
+                3053000,
+                3054000,
+                3055000,
+                3056000,
+                3057000,
+                3058000,
+                3059000,
+                3060000,
+                3061000,
+                3062000,
+                3063000,
+                3064000,
+                3065000,
+                3066000,
+                3067000,
+                3068000,
+                3069000,
+                3070000,
+                3071000,
+                3072000,
+                3073000,
+                3074000,
+                3075000,
+                3076000,
+                3077000,
+                3078000,
+                3079000,
+                3080000,
+                3081000,
+                3082000,
+                3083000,
+                3084000,
+                3085000,
+                3086000,
+                3087000,
+                3088000,
+                3089000,
+                3090000,
+                3091000,
+                3092000,
+                3093000,
+                3094000,
+                3095000,
+                3096000,
+                3097000,
+                3098000,
+                3099000,
+                3100000,
+                3101000,
+                3102000,
+                3103000,
+                3104000,
+                3105000,
+                3106000,
+                3107000,
+                3108000,
+                3109000,
+                3110000,
+                3111000,
+                3112000,
+                3113000,
+                3114000,
+                3115000,
+                3116000,
+                3117000,
+                3118000,
+                3119000,
+                3120000,
+                3121000,
+                3122000,
+                3123000,
+                3124000,
+                3125000,
+                3126000,
+                3127000,
+                3128000,
+                3129000,
+                3130000,
+                3131000,
+                3132000,
+                3133000,
+                3134000,
+                3135000,
+                3136000,
+                3137000,
+                3138000,
+                3139000,
+                3140000,
+                3141000,
+                3142000,
+                3143000,
+                3144000,
+                3145000,
+                3146000,
+                3147000,
+                3148000,
+                3149000,
+                3150000,
+                3151000,
+                3152000,
+                3153000,
+                3154000,
+                3155000,
+                3156000,
+                3157000,
+                3158000,
+                3159000,
+                3160000,
+                3161000,
+                3162000,
+                3163000,
+                3164000,
+                3165000,
+                3166000,
+                3167000,
+                3168000,
+                3169000,
+                3170000,
+                3171000,
+                3172000,
+                3173000,
+                3174000,
+                3175000,
+                3176000,
+                3177000,
+                3178000,
+                3179000,
+                3180000,
+                3181000,
+                3182000,
+                3183000,
+                3184000,
+                3185000,
+                3186000,
+                3187000,
+                3188000,
+                3189000,
+                3190000,
+                3191000,
+                3192000,
+                3193000,
+                3194000,
+                3195000,
+                3196000,
+                3197000,
+                3198000,
+                3199000,
+                3200000,
+                3201000,
+                3202000,
+                3203000,
+                3204000,
+                3205000,
+                3206000,
+                3207000,
+                3208000,
+                3209000,
+                3210000,
+                3211000,
+                3212000,
+                3213000,
+                3214000,
+                3215000,
+                3216000,
+                3217000,
+                3218000,
+                3219000,
+                3220000,
+                3221000,
+                3222000,
+                3223000,
+                3224000,
+                3225000,
+                3226000,
+                3227000,
+                3228000,
+                3229000,
+                3230000,
+                3231000,
+                3232000,
+                3233000,
+                3234000,
+                3235000,
+                3236000,
+                3237000,
+                3238000,
+                3239000,
+                3240000,
+                3241000,
+                3242000,
+                3243000,
+                3244000,
+                3245000,
+                3246000,
+                3247000,
+                3248000,
+                3249000,
+                3250000,
+                3251000,
+                3252000,
+                3253000,
+                3254000,
+                3255000,
+                3256000,
+                3257000,
+                3258000,
+                3259000,
+                3260000,
+                3261000,
+                3262000,
+                3263000,
+                3264000,
+                3265000,
+                3266000,
+                3267000,
+                3268000,
+                3269000,
+                3270000,
+                3271000,
+                3272000,
+                3273000,
+                3274000,
+                3275000,
+                3276000,
+                3277000,
+                3278000,
+                3279000,
+                3280000,
+                3281000,
+                3282000,
+                3283000,
+                3284000,
+                3285000,
+                3286000,
+                3287000,
+                3288000,
+                3289000,
+                3290000,
+                3291000,
+                3292000,
+                3293000,
+                3294000,
+                3295000,
+                3296000,
+                3297000,
+                3298000,
+                3299000,
+                3300000,
+                3301000,
+                3302000,
+                3303000,
+                3304000,
+                3305000,
+                3306000,
+                3307000,
+                3308000,
+                3309000,
+                3310000,
+                3311000,
+                3312000,
+                3313000,
+                3314000,
+                3315000,
+                3316000,
+                3317000,
+                3318000,
+                3319000,
+                3320000,
+                3321000,
+                3322000,
+                3323000,
+                3324000,
+                3325000,
+                3326000,
+                3327000,
+                3328000,
+                3329000,
+                3330000,
+                3331000,
+                3332000,
+                3333000,
+                3334000,
+                3335000,
+                3336000,
+                3337000,
+                3338000,
+                3339000,
+                3340000,
+                3341000,
+                3342000,
+                3343000,
+                3344000,
+                3345000,
+                3346000,
+                3347000,
+                3348000,
+                3349000,
+                3350000,
+                3351000,
+                3352000,
+                3353000,
+                3354000,
+                3355000,
+                3356000,
+                3357000,
+                3358000,
+                3359000,
+                3360000,
+                3361000,
+                3362000,
+                3363000,
+                3364000,
+                3365000,
+                3366000,
+                3367000,
+                3368000,
+                3369000,
+                3370000,
+                3371000,
+                3372000,
+                3373000,
+                3374000,
+                3375000,
+                3376000,
+                3377000,
+                3378000,
+                3379000,
+                3380000,
+                3381000,
+                3382000,
+                3383000,
+                3384000,
+                3385000,
+                3386000,
+                3387000,
+                3388000,
+                3389000,
+                3390000,
+                3391000,
+                3392000,
+                3393000,
+                3394000,
+                3395000,
+                3396000,
+                3397000,
+                3398000,
+                3399000,
+                3400000,
+                3401000,
+                3402000,
+                3403000,
+                3404000,
+                3405000,
+                3406000,
+                3407000,
+                3408000,
+                3409000,
+                3410000,
+                3411000,
+                3412000,
+                3413000,
+                3414000,
+                3415000,
+                3416000,
+                3417000,
+                3418000,
+                3419000,
+                3420000,
+                3421000,
+                3422000,
+                3423000,
+                3424000,
+                3425000,
+                3426000,
+                3427000,
+                3428000,
+                3429000,
+                3430000,
+                3431000,
+                3432000,
+                3433000,
+                3434000,
+                3435000,
+                3436000,
+                3437000,
+                3438000,
+                3439000,
+                3440000,
+                3441000,
+                3442000,
+                3443000,
+                3444000,
+                3445000,
+                3446000,
+                3447000,
+                3448000,
+                3449000,
+                3450000,
+                3451000,
+                3452000,
+                3453000,
+                3454000,
+                3455000,
+                3456000,
+                3457000,
+                3458000,
+                3459000,
+                3460000,
+                3461000,
+                3462000,
+                3463000,
+                3464000,
+                3465000,
+                3466000,
+                3467000,
+                3468000,
+                3469000,
+                3470000,
+                3471000,
+                3472000,
+                3473000,
+                3474000,
+                3475000,
+                3476000,
+                3477000,
+                3478000,
+                3479000,
+                3480000,
+                3481000,
+                3482000,
+                3483000,
+                3484000,
+                3485000,
+                3486000,
+                3487000,
+                3488000,
+                3489000,
+                3490000,
+                3491000,
+                3492000,
+                3493000,
+                3494000,
+                3495000,
+                3496000,
+                3497000,
+                3498000,
+                3499000,
+                3500000,
+                3501000,
+                3502000,
+                3503000,
+                3504000,
+                3505000,
+                3506000,
+                3507000,
+                3508000,
+                3509000,
+                3510000,
+                3511000,
+                3512000,
+                3513000,
+                3514000,
+                3515000,
+                3516000,
+                3517000,
+                3518000,
+                3519000,
+                3520000,
+                3521000,
+                3522000,
+                3523000,
+                3524000,
+                3525000,
+                3526000,
+                3527000,
+                3528000,
+                3529000,
+                3530000,
+                3531000,
+                3532000,
+                3533000,
+                3534000,
+                3535000,
+                3536000,
+                3537000,
+                3538000,
+                3539000,
+                3540000,
+                3541000,
+                3542000,
+                3543000,
+                3544000,
+                3545000,
+                3546000,
+                3547000,
+                3548000,
+                3549000,
+                3550000,
+                3551000,
+                3552000,
+                3553000,
+                3554000,
+                3555000,
+                3556000,
+                3557000,
+                3558000,
+                3559000,
+                3560000,
+                3561000,
+                3562000,
+                3563000,
+                3564000,
+                3565000,
+                3566000,
+                3567000,
+                3568000,
+                3569000,
+                3570000,
+                3571000,
+                3572000,
+                3573000,
+                3574000,
+                3575000,
+                3576000,
+                3577000,
+                3578000,
+                3579000,
+                3580000,
+                3581000,
+                3582000,
+                3583000,
+                3584000,
+                3585000,
+                3586000,
+                3587000,
+                3588000,
+                3589000,
+                3590000,
+                3591000,
+                3592000,
+                3593000,
+                3594000,
+                3595000,
+                3596000,
+                3597000,
+                3598000,
+                3599000,
+                3600000,
+                3601000,
+                3602000,
+                3603000,
+                3604000,
+                3605000,
+                3606000,
+                3607000,
+                3608000,
+                3609000,
+                3610000,
+                3611000,
+                3612000,
+                3613000,
+                3614000,
+                3615000,
+                3616000,
+                3617000,
+                3618000,
+                3619000,
+                3620000,
+                3621000,
+                3622000,
+                3623000,
+                3624000,
+                3625000,
+                3626000,
+                3627000,
+                3628000,
+                3629000,
+                3630000,
+                3631000,
+                3632000,
+                3633000,
+                3634000,
+                3635000,
+                3636000,
+                3637000,
+                3638000,
+                3639000,
+                3640000,
+                3641000,
+                3642000,
+                3643000,
+                3644000,
+                3645000,
+                3646000,
+                3647000,
+                3648000,
+                3649000,
+                3650000,
+                3651000,
+                3652000,
+                3653000,
+                3654000,
+                3655000,
+                3656000,
+                3657000,
+                3658000,
+                3659000,
+                3660000,
+                3661000,
+                3662000,
+                3663000,
+                3664000,
+                3665000,
+                3666000,
+                3667000,
+                3668000,
+                3669000,
+                3670000,
+                3671000,
+                3672000,
+                3673000,
+                3674000,
+                3675000,
+                3676000,
+                3677000,
+                3678000,
+                3679000,
+                3680000,
+                3681000,
+                3682000,
+                3683000,
+                3684000,
+                3685000,
+                3686000,
+                3687000,
+                3688000,
+                3689000,
+                3690000,
+                3691000,
+                3692000,
+                3693000,
+                3694000,
+                3695000,
+                3696000,
+                3697000,
+                3698000,
+                3699000,
+                3700000,
+                3701000,
+                3702000,
+                3703000,
+                3704000,
+                3705000,
+                3706000,
+                3707000,
+                3708000,
+                3709000,
+                3710000,
+                3711000,
+                3712000,
+                3713000,
+                3714000,
+                3715000,
+                3716000,
+                3717000,
+                3718000,
+                3719000,
+                3720000,
+                3721000,
+                3722000,
+                3723000,
+                3724000,
+                3725000,
+                3726000,
+                3727000,
+                3728000,
+                3729000,
+                3730000,
+                3731000,
+                3732000,
+                3733000,
+                3734000,
+                3735000,
+                3736000,
+                3737000,
+                3738000,
+                3739000,
+                3740000,
+                3741000,
+                3742000,
+                3743000,
+                3744000,
+                3745000,
+                3746000,
+                3747000,
+                3748000,
+                3749000,
+                3750000,
+                3751000,
+                3752000,
+                3753000,
+                3754000,
+                3755000,
+                3756000,
+                3757000,
+                3758000,
+                3759000,
+                3760000,
+                3761000,
+                3762000,
+                3763000,
+                3764000,
+                3765000,
+                3766000,
+                3767000,
+                3768000,
+                3769000,
+                3770000,
+                3771000,
+                3772000,
+                3773000,
+                3774000,
+                3775000,
+                3776000,
+                3777000,
+                3778000,
+                3779000,
+                3780000,
+                3781000,
+                3782000,
+                3783000,
+                3784000,
+                3785000,
+                3786000,
+                3787000,
+                3788000,
+                3789000,
+                3790000,
+                3791000,
+                3792000,
+                3793000,
+                3794000,
+                3795000,
+                3796000,
+                3797000,
+                3798000,
+                3799000,
+                3800000,
+                3801000,
+                3802000,
+                3803000,
+                3804000,
+                3805000,
+                3806000,
+                3807000,
+                3808000,
+                3809000,
+                3810000,
+                3811000,
+                3812000,
+                3813000,
+                3814000,
+                3815000,
+                3816000,
+                3817000,
+                3818000,
+                3819000,
+                3820000,
+                3821000,
+                3822000,
+                3823000,
+                3824000,
+                3825000,
+                3826000,
+                3827000,
+                3828000,
+                3829000,
+                3830000,
+                3831000,
+                3832000,
+                3833000,
+                3834000,
+                3835000,
+                3836000,
+                3837000,
+                3838000,
+                3839000,
+                3840000,
+                3841000,
+                3842000,
+                3843000,
+                3844000,
+                3845000,
+                3846000,
+                3847000,
+                3848000,
+                3849000,
+                3850000,
+                3851000,
+                3852000,
+                3853000,
+                3854000,
+                3855000,
+                3856000,
+                3857000,
+                3858000,
+                3859000,
+                3860000,
+                3861000,
+                3862000,
+                3863000,
+                3864000,
+                3865000,
+                3866000,
+                3867000,
+                3868000,
+                3869000,
+                3870000,
+                3871000,
+                3872000,
+                3873000,
+                3874000,
+                3875000,
+                3876000,
+                3877000,
+                3878000,
+                3879000,
+                3880000,
+                3881000,
+                3882000,
+                3883000,
+                3884000,
+                3885000,
+                3886000,
+                3887000,
+                3888000,
+                3889000,
+                3890000,
+                3891000,
+                3892000,
+                3893000,
+                3894000,
+                3895000,
+                3896000,
+                3897000,
+                3898000,
+                3899000,
+                3900000,
+                3901000,
+                3902000,
+                3903000,
+                3904000,
+                3905000,
+                3906000,
+                3907000,
+                3908000,
+                3909000,
+                3910000,
+                3911000,
+                3912000,
+                3913000,
+                3914000,
+                3915000,
+                3916000,
+                3917000,
+                3918000,
+                3919000,
+                3920000,
+                3921000,
+                3922000,
+                3923000,
+                3924000,
+                3925000,
+                3926000,
+                3927000,
+                3928000,
+                3929000,
+                3930000,
+                3931000,
+                3932000,
+                3933000,
+                3934000,
+                3935000,
+                3936000,
+                3937000,
+                3938000,
+                3939000,
+                3940000,
+                3941000,
+                3942000,
+                3943000,
+                3944000,
+                3945000,
+                3946000,
+                3947000,
+                3948000,
+                3949000,
+                3950000,
+                3951000,
+                3952000,
+                3953000,
+                3954000,
+                3955000,
+                3956000,
+                3957000,
+                3958000,
+                3959000,
+                3960000,
+                3961000,
+                3962000,
+                3963000,
+                3964000,
+                3965000,
+                3966000,
+                3967000,
+                3968000,
+                3969000,
+                3970000,
+                3971000,
+                3972000,
+                3973000,
+                3974000,
+                3975000,
+                3976000,
+                3977000,
+                3978000,
+                3979000,
+                3980000,
+                3981000,
+                3982000,
+                3983000,
+                3984000,
+                3985000,
+                3986000,
+                3987000,
+                3988000,
+                3989000,
+                3990000,
+                3991000,
+                3992000,
+                3993000,
+                3994000,
+                3995000,
+                3996000,
+                3997000,
+                3998000,
+                3999000,
+                4000000,
+                4001000,
+                4002000,
+                4003000,
+                4004000,
+                4005000,
+                4006000,
+                4007000,
+                4008000,
+                4009000,
+                4010000,
+                4011000,
+                4012000,
+                4013000,
+                4014000,
+                4015000,
+                4016000,
+                4017000,
+                4018000,
+                4019000,
+                4020000,
+                4021000,
+                4022000,
+                4023000,
+                4024000,
+                4025000,
+                4026000,
+                4027000,
+                4028000,
+                4029000,
+                4030000,
+                4031000,
+                4032000,
+                4033000,
+                4034000,
+                4035000,
+                4036000,
+                4037000,
+                4038000,
+                4039000,
+                4040000,
+                4041000,
+                4042000,
+                4043000,
+                4044000,
+                4045000,
+                4046000,
+                4047000,
+                4048000,
+                4049000,
+                4050000,
+                4051000,
+                4052000,
+                4053000,
+                4054000,
+                4055000,
+                4056000,
+                4057000,
+                4058000,
+                4059000,
+                4060000,
+                4061000,
+                4062000,
+                4063000,
+                4064000,
+                4065000,
+                4066000,
+                4067000,
+                4068000,
+                4069000,
+                4070000,
+                4071000,
+                4072000,
+                4073000,
+                4074000,
+                4075000,
+                4076000,
+                4077000,
+                4078000,
+                4079000,
+                4080000,
+                4081000,
+                4082000,
+                4083000,
+                4084000,
+                4085000,
+                4086000,
+                4087000,
+                4088000,
+                4089000,
+                4090000,
+                4091000,
+                4092000,
+                4093000,
+                4094000,
+                4095000,
+                4096000,
+                4097000,
+                4098000,
+                4099000,
+                4100000,
+                4101000,
+                4102000,
+                4103000,
+                4104000,
+                4105000,
+                4106000,
+                4107000,
+                4108000,
+                4109000,
+                4110000,
+                4111000,
+                4112000,
+                4113000,
+                4114000,
+                4115000,
+                4116000,
+                4117000,
+                4118000,
+                4119000,
+                4120000,
+                4121000,
+                4122000,
+                4123000,
+                4124000,
+                4125000,
+                4126000,
+                4127000,
+                4128000,
+                4129000,
+                4130000,
+                4131000,
+                4132000,
+                4133000,
+                4134000,
+                4135000,
+                4136000,
+                4137000,
+                4138000,
+                4139000,
+                4140000,
+                4141000,
+                4142000,
+                4143000,
+                4144000,
+                4145000,
+                4146000,
+                4147000,
+                4148000,
+                4149000,
+                4150000,
+                4151000,
+                4152000,
+                4153000,
+                4154000,
+                4155000,
+                4156000,
+                4157000,
+                4158000,
+                4159000,
+                4160000,
+                4161000,
+                4162000,
+                4163000,
+                4164000,
+                4165000,
+                4166000,
+                4167000,
+                4168000,
+                4169000,
+                4170000,
+                4171000,
+                4172000,
+                4173000,
+                4174000,
+                4175000,
+                4176000,
+                4177000,
+                4178000,
+                4179000,
+                4180000,
+                4181000,
+                4182000,
+                4183000,
+                4184000,
+                4185000,
+                4186000,
+                4187000,
+                4188000,
+                4189000,
+                4190000,
+                4191000,
+                4192000,
+                4193000,
+                4194000,
+                4195000,
+                4196000,
+                4197000,
+                4198000,
+                4199000,
+                4200000,
+                4201000,
+                4202000,
+                4203000,
+                4204000,
+                4205000,
+                4206000,
+                4207000,
+                4208000,
+                4209000,
+                4210000,
+                4211000,
+                4212000,
+                4213000,
+                4214000,
+                4215000,
+                4216000,
+                4217000,
+                4218000,
+                4219000,
+                4220000,
+                4221000,
+                4222000,
+                4223000,
+                4224000,
+                4225000,
+                4226000,
+                4227000,
+                4228000,
+                4229000,
+                4230000,
+                4231000,
+                4232000,
+                4233000,
+                4234000,
+                4235000,
+                4236000,
+                4237000,
+                4238000,
+                4239000,
+                4240000,
+                4241000,
+                4242000,
+                4243000,
+                4244000,
+                4245000,
+                4246000,
+                4247000,
+                4248000,
+                4249000,
+                4250000,
+                4251000,
+                4252000,
+                4253000,
+                4254000,
+                4255000,
+                4256000,
+                4257000,
+                4258000,
+                4259000,
+                4260000,
+                4261000,
+                4262000,
+                4263000,
+                4264000,
+                4265000,
+                4266000,
+                4267000,
+                4268000,
+                4269000,
+                4270000,
+                4271000,
+                4272000,
+                4273000,
+                4274000,
+                4275000,
+                4276000,
+                4277000,
+                4278000,
+                4279000,
+                4280000,
+                4281000,
+                4282000,
+                4283000,
+                4284000,
+                4285000,
+                4286000,
+                4287000,
+                4288000,
+                4289000,
+                4290000,
+                4291000,
+                4292000,
+                4293000,
+                4294000,
+                4295000,
+                4296000,
+                4297000,
+                4298000,
+                4299000,
+                4300000,
+                4301000
               ],
               "values": [
                 250,
diff --git a/fixtures/ssrf/refusals.divejson b/fixtures/ssrf/refusals.divejson
index a2e8604..e52815c 100644
--- a/fixtures/ssrf/refusals.divejson
+++ b/fixtures/ssrf/refusals.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-05T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.2.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -22,11 +22,11 @@
       "recordings": [
         {
           "profile": {
-            "duration": 30,
+            "duration": 30000,
             "depth": {
               "times": [
                 0,
-                30
+                30000
               ],
               "values": [
                 0,
@@ -35,7 +35,7 @@
             },
             "temperature": {
               "times": [
-                30
+                30000
               ],
               "values": [
                 195
@@ -80,11 +80,11 @@
       "recordings": [
         {
           "profile": {
-            "duration": 120,
+            "duration": 120000,
             "depth": {
               "times": [
                 0,
-                120
+                120000
               ],
               "values": [
                 0,
diff --git a/fixtures/ssrf/subsurface.divejson b/fixtures/ssrf/subsurface.divejson
index 693a1de..b9c94ff 100644
--- a/fixtures/ssrf/subsurface.divejson
+++ b/fixtures/ssrf/subsurface.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-05T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.2.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -13,8 +13,6 @@
       "started_at": "2026-04-17T11:49:23",
       "duration": 4010,
       "notes": "House-reef checkout dive - profile, temperature and tank pressure pulled straight from the export.",
-      "cns_end": 11.0,
-      "otu_end": 31.0,
       "site_uuids": [
         "7d933baf-e3e9-5ae1-91b7-c225045cd347"
       ],
@@ -33,18 +31,20 @@
           "device": {
             "model": "Open Diving"
           },
+          "cns_end": 11.0,
+          "otu_end": 31.0,
           "profile": {
-            "duration": 4300,
+            "duration": 4300000,
             "depth": {
               "times": [
                 0,
-                10,
-                20,
-                30,
-                40,
-                80,
-                170,
-                4300
+                10000,
+                20000,
+                30000,
+                40000,
+                80000,
+                170000,
+                4300000
               ],
               "values": [
                 145,
@@ -59,8 +59,8 @@
             },
             "temperature": {
               "times": [
-                30,
-                80
+                30000,
+                80000
               ],
               "values": [
                 244,
@@ -77,8 +77,6 @@
       "started_at": "2026-04-19T08:12:00",
       "duration": 2880,
       "notes": "Subsurface builds a depth profile from max depth and duration for a dive that has none; these six samples are that fabrication, carried through as recorded rather than trimmed away.",
-      "cns_end": 14.0,
-      "otu_end": 37.0,
       "site_uuids": [
         "e46b0021-5ed5-55e5-9a60-d6d656acfa76"
       ],
@@ -98,16 +96,18 @@
           "device": {
             "model": "Open Diving"
           },
+          "cns_end": 14.0,
+          "otu_end": 37.0,
           "profile": {
-            "duration": 2880,
+            "duration": 2880000,
             "depth": {
               "times": [
                 0,
-                197,
-                1176,
-                1308,
-                2815,
-                2880
+                197000,
+                1176000,
+                1308000,
+                2815000,
+                2880000
               ],
               "values": [
                 0,
diff --git a/fixtures/ssrf/trip-grouping.divejson b/fixtures/ssrf/trip-grouping.divejson
index cad2f87..79cd587 100644
--- a/fixtures/ssrf/trip-grouping.divejson
+++ b/fixtures/ssrf/trip-grouping.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-05T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.2.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -29,12 +29,12 @@
       "recordings": [
         {
           "profile": {
-            "duration": 3660,
+            "duration": 3660000,
             "depth": {
               "times": [
                 0,
-                1895,
-                3660
+                1895000,
+                3660000
               ],
               "values": [
                 0,
@@ -63,7 +63,13 @@
       "started_at": "2026-07-11T09:45:00",
       "duration": 3480,
       "max_depth": 14.9,
-      "avg_depth": 9.1
+      "avg_depth": 9.1,
+      "recordings": [
+        {
+          "cns_end": 6.0,
+          "otu_end": 9.0
+        }
+      ]
     }
   ],
   "sites": [
diff --git a/fixtures/ssrf/trip-grouping.ssrf b/fixtures/ssrf/trip-grouping.ssrf
index 5f3fca3..2b84af3 100644
--- a/fixtures/ssrf/trip-grouping.ssrf
+++ b/fixtures/ssrf/trip-grouping.ssrf
@@ -24,7 +24,7 @@
   </divecomputer>
 </dive>
 </trip>
-<dive number='44' date='2026-07-11' time='09:45:00' duration='58:00 min'>
+<dive number='44' otu='9' cns='6%' date='2026-07-11' time='09:45:00' duration='58:00 min'>
   <divecomputer last-manual-time='58:00 min'>
   <depth max='14.9 m' mean='9.1 m' />
   </divecomputer>
diff --git a/fixtures/ssrf/two-computers.divejson b/fixtures/ssrf/two-computers.divejson
index a9e912d..500f941 100644
--- a/fixtures/ssrf/two-computers.divejson
+++ b/fixtures/ssrf/two-computers.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-05T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.4.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -35,12 +35,12 @@
             "firmware": "2.51.28"
           },
           "profile": {
-            "duration": 3051,
+            "duration": 3051000,
             "depth": {
               "times": [
                 0,
-                600,
-                3051
+                600000,
+                3051000
               ],
               "values": [
                 0,
@@ -51,7 +51,7 @@
             "temperature": {
               "times": [
                 0,
-                3051
+                3051000
               ],
               "values": [
                 298,
@@ -66,12 +66,12 @@
           },
           "started_at": "2026-09-08T15:18:10",
           "profile": {
-            "duration": 3019,
+            "duration": 3019000,
             "depth": {
               "times": [
                 0,
-                568,
-                3019
+                568000,
+                3019000
               ],
               "values": [
                 0,
diff --git a/fixtures/suunto_json/d5-deco-max-depth.divejson b/fixtures/suunto_json/d5-deco-max-depth.divejson
index dbb1267..885b63f 100644
--- a/fixtures/suunto_json/d5-deco-max-depth.divejson
+++ b/fixtures/suunto_json/d5-deco-max-depth.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-11T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.5.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -13,11 +13,6 @@
       "duration": 4683,
       "max_depth": 46.29,
       "avg_depth": 17.79,
-      "cns_start": 0.0,
-      "otu_start": 0.0,
-      "cns_end": 19.9,
-      "otu_end": 52.996395111083984,
-      "surface_pressure": 1.057,
       "cylinders": [
         {
           "volume": 22.0,
@@ -25,7 +20,7 @@
           "end_pressure": 122.4375,
           "oxygen": 21.0,
           "helium": 0.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "role": "bottom",
           "gas_number": 0
         },
@@ -33,7 +28,7 @@
           "volume": 11.0,
           "oxygen": 49.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "role": "bottom",
           "gas_number": 1
         }
@@ -53,23 +48,28 @@
             "name": "Suunto Fused2 RGBM",
             "conservatism": -1
           },
+          "surface_pressure": 1.057,
+          "cns_start": 0.0,
+          "cns_end": 19.9,
+          "otu_start": 0.0,
+          "otu_end": 52.996395111083984,
           "profile": {
-            "duration": 4683,
+            "duration": 4683470,
             "depth": {
               "times": [
-                1,
-                781,
-                1132,
-                1142,
-                1152,
-                1162,
-                1172,
-                1182,
-                1562,
-                2342,
-                3123,
-                3903,
-                4683
+                860,
+                781270,
+                1131830,
+                1141840,
+                1151840,
+                1161840,
+                1171850,
+                1181850,
+                1561970,
+                2342250,
+                3122670,
+                3902990,
+                4683470
               ],
               "values": [
                 124,
@@ -89,10 +89,10 @@
             },
             "ceiling": {
               "times": [
-                1182,
-                1562,
-                2342,
-                3123
+                1181850,
+                1561970,
+                2342250,
+                3122670
               ],
               "values": [
                 300,
@@ -103,19 +103,19 @@
             },
             "temperature": {
               "times": [
-                1,
-                781,
-                1132,
-                1142,
-                1152,
-                1162,
-                1172,
-                1182,
-                1562,
-                2342,
-                3123,
-                3903,
-                4683
+                860,
+                781270,
+                1131830,
+                1141840,
+                1151840,
+                1161840,
+                1171850,
+                1181850,
+                1561970,
+                2342250,
+                3122670,
+                3902990,
+                4683470
               ],
               "values": [
                 240,
@@ -136,19 +136,19 @@
             "pressures": [
               {
                 "times": [
-                  1,
-                  781,
-                  1132,
-                  1142,
-                  1152,
-                  1162,
-                  1172,
-                  1182,
-                  1562,
-                  2342,
-                  3123,
-                  3903,
-                  4683
+                  860,
+                  781270,
+                  1131830,
+                  1141840,
+                  1151840,
+                  1161840,
+                  1171850,
+                  1181850,
+                  1561970,
+                  2342250,
+                  3122670,
+                  3902990,
+                  4683470
                 ],
                 "values": [
                   2071,
@@ -170,15 +170,15 @@
             ],
             "ndl": {
               "times": [
-                1,
-                781,
-                1132,
-                1142,
-                1152,
-                1162,
-                1172,
-                3903,
-                4683
+                860,
+                781270,
+                1131830,
+                1141840,
+                1151840,
+                1161840,
+                1171850,
+                3902990,
+                4683470
               ],
               "values": [
                 6000,
@@ -194,18 +194,18 @@
             },
             "tts": {
               "times": [
-                781,
-                1132,
-                1142,
-                1152,
-                1162,
-                1172,
-                1182,
-                1562,
-                2342,
-                3123,
-                3903,
-                4683
+                781270,
+                1131830,
+                1141840,
+                1151840,
+                1161840,
+                1171850,
+                1181850,
+                1561970,
+                2342250,
+                3122670,
+                3902990,
+                4683470
               ],
               "values": [
                 156,
@@ -229,36 +229,36 @@
                 "gas_number": 0
               },
               {
-                "time": 949,
+                "time": 948940,
                 "type": "depth_alarm",
                 "label": "Max.Depth"
               },
               {
-                "time": 1173,
+                "time": 1173110,
                 "type": "ndl_reached"
               },
               {
-                "time": 2148,
+                "time": 2147980,
                 "type": "ascent_rate",
                 "label": "Ascent Speed"
               },
               {
-                "time": 2148,
+                "time": 2147980,
                 "type": "safety_stop_mandatory",
                 "label": "Mandatory Safety Stop"
               },
               {
-                "time": 2356,
+                "time": 2355570,
                 "type": "gas_switch",
                 "gas_number": 1
               },
               {
-                "time": 2858,
+                "time": 2858150,
                 "type": "ceiling_violation",
                 "label": "Ceiling Broken"
               },
               {
-                "time": 3841,
+                "time": 3840970,
                 "type": "safety_stop"
               }
             ]
diff --git a/fixtures/suunto_json/d5-deep-stop-broken.divejson b/fixtures/suunto_json/d5-deep-stop-broken.divejson
index 2527db3..d2882a9 100644
--- a/fixtures/suunto_json/d5-deep-stop-broken.divejson
+++ b/fixtures/suunto_json/d5-deep-stop-broken.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-11T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.5.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -13,11 +13,6 @@
       "duration": 3462,
       "max_depth": 28.27,
       "avg_depth": 12.92,
-      "cns_start": 8.3,
-      "otu_start": 31.794235229492188,
-      "cns_end": 18.6,
-      "otu_end": 59.34442138671875,
-      "surface_pressure": 1.055,
       "cylinders": [
         {
           "volume": 11.0,
@@ -25,7 +20,7 @@
           "end_pressure": 53.59375,
           "oxygen": 31.0,
           "helium": 0.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "role": "bottom",
           "gas_number": 0
         }
@@ -45,17 +40,22 @@
             "name": "Suunto Fused2 RGBM",
             "conservatism": -1
           },
+          "surface_pressure": 1.055,
+          "cns_start": 8.3,
+          "cns_end": 18.6,
+          "otu_start": 31.794235229492188,
+          "otu_end": 59.34442138671875,
           "profile": {
-            "duration": 3463,
+            "duration": 3462960,
             "depth": {
               "times": [
-                1,
-                571,
-                1152,
-                1732,
-                2312,
-                2893,
-                3463
+                980,
+                571240,
+                1151560,
+                1731870,
+                2312170,
+                2892610,
+                3462960
               ],
               "values": [
                 126,
@@ -69,13 +69,13 @@
             },
             "temperature": {
               "times": [
-                1,
-                571,
-                1152,
-                1732,
-                2312,
-                2893,
-                3463
+                980,
+                571240,
+                1151560,
+                1731870,
+                2312170,
+                2892610,
+                3462960
               ],
               "values": [
                 264,
@@ -90,13 +90,13 @@
             "pressures": [
               {
                 "times": [
-                  1,
-                  571,
-                  1152,
-                  1732,
-                  2312,
-                  2893,
-                  3463
+                  980,
+                  571240,
+                  1151560,
+                  1731870,
+                  2312170,
+                  2892610,
+                  3462960
                 ],
                 "values": [
                   2064,
@@ -112,13 +112,13 @@
             ],
             "ndl": {
               "times": [
-                1,
-                571,
-                1152,
-                1732,
-                2312,
-                2893,
-                3463
+                980,
+                571240,
+                1151560,
+                1731870,
+                2312170,
+                2892610,
+                3462960
               ],
               "values": [
                 6000,
@@ -132,12 +132,12 @@
             },
             "tts": {
               "times": [
-                571,
-                1152,
-                1732,
-                2312,
-                2893,
-                3463
+                571240,
+                1151560,
+                1731870,
+                2312170,
+                2892610,
+                3462960
               ],
               "values": [
                 120,
@@ -155,52 +155,52 @@
                 "gas_number": 0
               },
               {
-                "time": 1367,
+                "time": 1366880,
                 "type": "ascent_rate",
                 "label": "Ascent Speed"
               },
               {
-                "time": 1367,
+                "time": 1366880,
                 "type": "safety_stop_mandatory",
                 "label": "Mandatory Safety Stop"
               },
               {
-                "time": 1790,
+                "time": 1789870,
                 "type": "deep_stop"
               },
               {
-                "time": 1827,
+                "time": 1826910,
                 "type": "deep_stop_violation",
                 "label": "Deep Stop Broken"
               },
               {
-                "time": 1837,
+                "time": 1836920,
                 "type": "deep_stop_violation",
                 "label": "Violated Deep Stop"
               },
               {
-                "time": 2900,
+                "time": 2899880,
                 "type": "safety_stop"
               },
               {
-                "time": 2913,
+                "time": 2912910,
                 "type": "safety_stop"
               },
               {
-                "time": 2987,
+                "time": 2986910,
                 "type": "safety_stop_violation",
                 "label": "Safety Stop Broken"
               },
               {
-                "time": 3001,
+                "time": 3000940,
                 "type": "safety_stop_violation"
               },
               {
-                "time": 3002,
+                "time": 3001920,
                 "type": "safety_stop"
               },
               {
-                "time": 3002,
+                "time": 3001920,
                 "type": "safety_stop_violation",
                 "label": "Safety Stop Broken"
               }
diff --git a/fixtures/suunto_json/d5-stop-alarms.divejson b/fixtures/suunto_json/d5-stop-alarms.divejson
index 4d72bb6..60dbd82 100644
--- a/fixtures/suunto_json/d5-stop-alarms.divejson
+++ b/fixtures/suunto_json/d5-stop-alarms.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-11T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.5.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -13,17 +13,12 @@
       "duration": 2831,
       "max_depth": 25.37,
       "avg_depth": 14.54,
-      "cns_start": 3.0,
-      "otu_start": 3.5761935710906982,
-      "cns_end": 7.1,
-      "otu_end": 11.986471176147461,
-      "surface_pressure": 1.046,
       "cylinders": [
         {
           "volume": 12.0,
           "oxygen": 21.0,
           "helium": 0.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "role": "bottom",
           "gas_number": 0
         }
@@ -43,23 +38,28 @@
             "name": "Suunto Fused2 RGBM",
             "conservatism": 0
           },
+          "surface_pressure": 1.046,
+          "cns_start": 3.0,
+          "cns_end": 7.1,
+          "otu_start": 3.5761935710906982,
+          "otu_end": 11.986471176147461,
           "profile": {
-            "duration": 2831,
+            "duration": 2831310,
             "depth": {
               "times": [
-                0,
-                471,
-                941,
-                1391,
-                1401,
-                1411,
-                1421,
-                1431,
-                1441,
-                1461,
-                1891,
-                2361,
-                2831
+                470,
+                470530,
+                940740,
+                1390950,
+                1400950,
+                1410940,
+                1420950,
+                1430950,
+                1440950,
+                1460960,
+                1891160,
+                2361240,
+                2831310
               ],
               "values": [
                 129,
@@ -79,9 +79,9 @@
             },
             "ceiling": {
               "times": [
-                1461,
-                1891,
-                2361
+                1460960,
+                1891160,
+                2361240
               ],
               "values": [
                 300,
@@ -91,19 +91,19 @@
             },
             "temperature": {
               "times": [
-                0,
-                471,
-                941,
-                1391,
-                1401,
-                1411,
-                1421,
-                1431,
-                1441,
-                1461,
-                1891,
-                2361,
-                2831
+                470,
+                470530,
+                940740,
+                1390950,
+                1400950,
+                1410940,
+                1420950,
+                1430950,
+                1440950,
+                1460960,
+                1891160,
+                2361240,
+                2831310
               ],
               "values": [
                 251,
@@ -123,16 +123,16 @@
             },
             "ndl": {
               "times": [
-                0,
-                471,
-                941,
-                1391,
-                1401,
-                1411,
-                1421,
-                1431,
-                1441,
-                2831
+                470,
+                470530,
+                940740,
+                1390950,
+                1400950,
+                1410940,
+                1420950,
+                1430950,
+                1440950,
+                2831310
               ],
               "values": [
                 6000,
@@ -149,18 +149,18 @@
             },
             "tts": {
               "times": [
-                471,
-                941,
-                1391,
-                1401,
-                1411,
-                1421,
-                1431,
-                1441,
-                1461,
-                1891,
-                2361,
-                2831
+                470530,
+                940740,
+                1390950,
+                1400950,
+                1410940,
+                1420950,
+                1430950,
+                1440950,
+                1460960,
+                1891160,
+                2361240,
+                2831310
               ],
               "values": [
                 188,
@@ -184,76 +184,76 @@
                 "gas_number": 0
               },
               {
-                "time": 206,
+                "time": 205970,
                 "type": "ascent_rate",
                 "label": "Ascent Speed"
               },
               {
-                "time": 206,
+                "time": 205970,
                 "type": "safety_stop_mandatory",
                 "label": "Mandatory Safety Stop"
               },
               {
-                "time": 1094,
+                "time": 1093940,
                 "type": "deep_stop"
               },
               {
-                "time": 1297,
+                "time": 1296970,
                 "type": "ascent_rate",
                 "label": "Ascent Speed"
               },
               {
-                "time": 1451,
+                "time": 1451010,
                 "type": "ndl_reached"
               },
               {
-                "time": 1761,
+                "time": 1760950,
                 "type": "deep_stop"
               },
               {
-                "time": 1936,
+                "time": 1935950,
                 "type": "ascent_rate",
                 "label": "Ascent Speed"
               },
               {
-                "time": 2149,
+                "time": 2148950,
                 "type": "ascent_rate",
                 "label": "Ascent Speed"
               },
               {
-                "time": 2629,
+                "time": 2628960,
                 "type": "safety_stop"
               },
               {
-                "time": 2739,
+                "time": 2738970,
                 "type": "ascent_rate",
                 "label": "Ascent Speed"
               },
               {
-                "time": 2739,
+                "time": 2738970,
                 "type": "safety_stop"
               },
               {
-                "time": 2739,
+                "time": 2738970,
                 "type": "safety_stop_mandatory",
                 "label": "Mandatory Safety Stop"
               },
               {
-                "time": 2739,
+                "time": 2738970,
                 "type": "safety_stop_violation",
                 "label": "Safety Stop Broken"
               },
               {
-                "time": 2740,
+                "time": 2739970,
                 "type": "safety_stop_violation",
                 "label": "Mandatory Safety Stop Broken"
               },
               {
-                "time": 2775,
+                "time": 2774990,
                 "type": "safety_stop"
               },
               {
-                "time": 2775,
+                "time": 2774990,
                 "type": "safety_stop_violation",
                 "label": "Safety Stop Broken"
               }
diff --git a/fixtures/suunto_json/ocean-deco-ppo2.divejson b/fixtures/suunto_json/ocean-deco-ppo2.divejson
index 2cbe5c9..738480b 100644
--- a/fixtures/suunto_json/ocean-deco-ppo2.divejson
+++ b/fixtures/suunto_json/ocean-deco-ppo2.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-11T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.5.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -40,25 +40,25 @@
             "name": "Porvoo"
           },
           "profile": {
-            "duration": 4751,
+            "duration": 4751120,
             "depth": {
               "times": [
-                1,
-                670,
-                680,
-                690,
-                700,
-                710,
-                720,
-                730,
-                790,
-                1580,
-                1770,
-                2380,
-                2810,
-                3170,
-                3960,
-                4750
+                850,
+                670100,
+                680100,
+                690100,
+                700100,
+                710100,
+                720100,
+                730100,
+                790100,
+                1580100,
+                1770100,
+                2380100,
+                2810100,
+                3170120,
+                3960100,
+                4750100
               ],
               "values": [
                 130,
@@ -81,10 +81,10 @@
             },
             "ceiling": {
               "times": [
-                730,
-                1580,
-                2380,
-                3170
+                730100,
+                1580100,
+                2380100,
+                3170120
               ],
               "values": [
                 300,
@@ -95,8 +95,8 @@
             },
             "temperature": {
               "times": [
-                8,
-                4751
+                8120,
+                4751120
               ],
               "values": [
                 233,
@@ -106,22 +106,22 @@
             "pressures": [
               {
                 "times": [
-                  1,
-                  670,
-                  680,
-                  690,
-                  700,
-                  710,
-                  720,
-                  730,
-                  790,
-                  1580,
-                  1770,
-                  2380,
-                  2810,
-                  3170,
-                  3960,
-                  4750
+                  850,
+                  670100,
+                  680100,
+                  690100,
+                  700100,
+                  710100,
+                  720100,
+                  730100,
+                  790100,
+                  1580100,
+                  1770100,
+                  2380100,
+                  2810100,
+                  3170120,
+                  3960100,
+                  4750100
                 ],
                 "values": [
                   2106,
@@ -146,15 +146,15 @@
             ],
             "ndl": {
               "times": [
-                1,
-                670,
-                680,
-                690,
-                700,
-                710,
-                720,
-                3960,
-                4750
+                850,
+                670100,
+                680100,
+                690100,
+                700100,
+                710100,
+                720100,
+                3960100,
+                4750100
               ],
               "values": [
                 6000,
@@ -170,15 +170,15 @@
             },
             "tts": {
               "times": [
-                1,
-                670,
-                680,
-                710,
-                730,
-                1580,
-                2380,
-                3170,
-                3960
+                850,
+                670100,
+                680100,
+                710100,
+                730100,
+                1580100,
+                2380100,
+                3170120,
+                3960100
               ],
               "values": [
                 8,
@@ -194,10 +194,10 @@
             },
             "gradient_factor": {
               "times": [
-                2810,
-                3170,
-                3960,
-                4750
+                2810100,
+                3170120,
+                3960100,
+                4750100
               ],
               "values": [
                 398,
@@ -208,22 +208,22 @@
             },
             "surface_gradient_factor": {
               "times": [
-                1,
-                670,
-                680,
-                690,
-                700,
-                710,
-                720,
-                730,
-                790,
-                1580,
-                1770,
-                2380,
-                2810,
-                3170,
-                3960,
-                4750
+                850,
+                670100,
+                680100,
+                690100,
+                700100,
+                710100,
+                720100,
+                730100,
+                790100,
+                1580100,
+                1770100,
+                2380100,
+                2810100,
+                3170120,
+                3960100,
+                4750100
               ],
               "values": [
                 0,
@@ -246,52 +246,52 @@
             },
             "events": [
               {
-                "time": 0,
+                "time": 110,
                 "type": "gas_switch",
                 "gas_number": 0
               },
               {
-                "time": 508,
+                "time": 508000,
                 "type": "ndl_reached",
                 "label": "NoDecoTime"
               },
               {
-                "time": 2161,
+                "time": 2160930,
                 "type": "gas_switch",
                 "gas_number": 1
               },
               {
-                "time": 2161,
+                "time": 2160930,
                 "type": "ppo2_high",
                 "label": "PO2 High"
               },
               {
-                "time": 2167,
+                "time": 2166800,
                 "type": "ppo2_high",
                 "label": "PO2 High"
               },
               {
-                "time": 2171,
+                "time": 2170800,
                 "type": "ppo2_high",
                 "label": "PO2 High"
               },
               {
-                "time": 2203,
+                "time": 2203100,
                 "type": "ppo2_high",
                 "label": "PO2 High"
               },
               {
-                "time": 2213,
+                "time": 2213200,
                 "type": "ppo2_high",
                 "label": "PO2 High"
               },
               {
-                "time": 2225,
+                "time": 2224600,
                 "type": "ppo2_high",
                 "label": "PO2 High"
               },
               {
-                "time": 2238,
+                "time": 2237700,
                 "type": "ppo2_high",
                 "label": "PO2 High"
               }
diff --git a/fixtures/suunto_json/ocean-tank-pressure.divejson b/fixtures/suunto_json/ocean-tank-pressure.divejson
index 9f97652..5c6ae12 100644
--- a/fixtures/suunto_json/ocean-tank-pressure.divejson
+++ b/fixtures/suunto_json/ocean-tank-pressure.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-11T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.5.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -37,22 +37,22 @@
             "name": "Porvoo"
           },
           "profile": {
-            "duration": 4230,
+            "duration": 4230080,
             "depth": {
               "times": [
-                0,
-                700,
-                1410,
-                2120,
-                2820,
-                3530,
-                3920,
-                3940,
-                3950,
-                3960,
-                3970,
-                3980,
-                4230
+                90,
+                700000,
+                1410000,
+                2120000,
+                2820000,
+                3530000,
+                3920000,
+                3940000,
+                3950000,
+                3960000,
+                3970000,
+                3980000,
+                4229970
               ],
               "values": [
                 122,
@@ -72,8 +72,8 @@
             },
             "temperature": {
               "times": [
-                8,
-                4230
+                8110,
+                4230080
               ],
               "values": [
                 235,
@@ -83,19 +83,19 @@
             "pressures": [
               {
                 "times": [
-                  0,
-                  700,
-                  1410,
-                  2120,
-                  2820,
-                  3530,
-                  3920,
-                  3940,
-                  3950,
-                  3960,
-                  3970,
-                  3980,
-                  4230
+                  90,
+                  700000,
+                  1410000,
+                  2120000,
+                  2820000,
+                  3530000,
+                  3920000,
+                  3940000,
+                  3950000,
+                  3960000,
+                  3970000,
+                  3980000,
+                  4229970
                 ],
                 "values": [
                   2047,
@@ -117,19 +117,19 @@
             ],
             "ndl": {
               "times": [
-                0,
-                700,
-                1410,
-                2120,
-                2820,
-                3530,
-                3920,
-                3940,
-                3950,
-                3960,
-                3970,
-                3980,
-                4230
+                90,
+                700000,
+                1410000,
+                2120000,
+                2820000,
+                3530000,
+                3920000,
+                3940000,
+                3950000,
+                3960000,
+                3970000,
+                3980000,
+                4229970
               ],
               "values": [
                 6000,
@@ -149,11 +149,11 @@
             },
             "tts": {
               "times": [
-                0,
-                700,
-                2120,
-                2820,
-                3530
+                90,
+                700000,
+                2120000,
+                2820000,
+                3530000
               ],
               "values": [
                 8,
@@ -165,13 +165,13 @@
             },
             "gradient_factor": {
               "times": [
-                3920,
-                3940,
-                3950,
-                3960,
-                3970,
-                3980,
-                4230
+                3920000,
+                3940000,
+                3950000,
+                3960000,
+                3970000,
+                3980000,
+                4229970
               ],
               "values": [
                 0,
@@ -185,19 +185,19 @@
             },
             "surface_gradient_factor": {
               "times": [
-                0,
-                700,
-                1410,
-                2120,
-                2820,
-                3530,
-                3920,
-                3940,
-                3950,
-                3960,
-                3970,
-                3980,
-                4230
+                90,
+                700000,
+                1410000,
+                2120000,
+                2820000,
+                3530000,
+                3920000,
+                3940000,
+                3950000,
+                3960000,
+                3970000,
+                3980000,
+                4229970
               ],
               "values": [
                 7,
@@ -222,12 +222,12 @@
                 "gas_number": 0
               },
               {
-                "time": 3955,
+                "time": 3954890,
                 "type": "pressure_low",
                 "label": "Tank Pressure"
               },
               {
-                "time": 4203,
+                "time": 4202860,
                 "type": "pressure_low",
                 "label": "Tank Pressure"
               }
diff --git a/fixtures/suunto_json/purged-regulator.divejson b/fixtures/suunto_json/purged-regulator.divejson
index 245da69..11d5180 100644
--- a/fixtures/suunto_json/purged-regulator.divejson
+++ b/fixtures/suunto_json/purged-regulator.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-05T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.2.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -28,12 +28,12 @@
             "name": "Suunto Ocean"
           },
           "profile": {
-            "duration": 4230,
+            "duration": 4229970,
             "depth": {
               "times": [
-                0,
-                1560,
-                3880
+                90,
+                1560000,
+                3880180
               ],
               "values": [
                 122,
@@ -44,10 +44,10 @@
             "pressures": [
               {
                 "times": [
-                  0,
-                  1560,
-                  3880,
-                  4230
+                  90,
+                  1560000,
+                  3880180,
+                  4229970
                 ],
                 "values": [
                   2047,
@@ -60,7 +60,7 @@
             ],
             "events": [
               {
-                "time": 0,
+                "time": 90,
                 "type": "gas_switch",
                 "gas_number": 0
               }
diff --git a/fixtures/suunto_json/suunto-d5.divejson b/fixtures/suunto_json/suunto-d5.divejson
index 4944a14..a8ddd36 100644
--- a/fixtures/suunto_json/suunto-d5.divejson
+++ b/fixtures/suunto_json/suunto-d5.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-05T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.2.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -13,11 +13,6 @@
       "duration": 4683,
       "max_depth": 46.29,
       "avg_depth": 17.79,
-      "cns_start": 7.2,
-      "otu_start": 23.09649658203125,
-      "cns_end": 15.3,
-      "otu_end": 45.12766647338867,
-      "surface_pressure": 1.049,
       "cylinders": [
         {
           "volume": 22.0,
@@ -25,7 +20,7 @@
           "end_pressure": 122.4375,
           "oxygen": 21.0,
           "helium": 0.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "role": "bottom",
           "gas_number": 0
         },
@@ -33,7 +28,7 @@
           "volume": 11.0,
           "oxygen": 49.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "role": "bottom",
           "gas_number": 1
         }
@@ -50,14 +45,19 @@
             "algorithm": "rgbm",
             "name": "Suunto Fused RGBM 2"
           },
+          "surface_pressure": 1.049,
+          "cns_start": 7.2,
+          "cns_end": 15.3,
+          "otu_start": 23.09649658203125,
+          "otu_end": 45.12766647338867,
           "profile": {
-            "duration": 4683,
+            "duration": 4683000,
             "depth": {
               "times": [
                 0,
-                2000,
-                4000,
-                4683
+                2000000,
+                4000000,
+                4683000
               ],
               "values": [
                 110,
@@ -68,7 +68,7 @@
             },
             "ceiling": {
               "times": [
-                2000
+                2000000
               ],
               "values": [
                 300
@@ -77,7 +77,7 @@
             "temperature": {
               "times": [
                 0,
-                2000
+                2000000
               ],
               "values": [
                 206,
@@ -88,8 +88,8 @@
               {
                 "times": [
                   0,
-                  2000,
-                  4683
+                  2000000,
+                  4683000
                 ],
                 "values": [
                   2071,
@@ -106,17 +106,17 @@
                 "gas_number": 0
               },
               {
-                "time": 4000,
+                "time": 4000000,
                 "type": "gas_switch",
                 "gas_number": 1
               },
               {
-                "time": 4000,
+                "time": 4000000,
                 "type": "ascent_rate",
                 "label": "Ascent Speed"
               },
               {
-                "time": 4683,
+                "time": 4683000,
                 "type": "safety_stop"
               }
             ]
diff --git a/fixtures/suunto_json/suunto-ocean-2026.divejson b/fixtures/suunto_json/suunto-ocean-2026.divejson
index 1912b7a..696bc20 100644
--- a/fixtures/suunto_json/suunto-ocean-2026.divejson
+++ b/fixtures/suunto_json/suunto-ocean-2026.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-05T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.4.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -37,14 +37,14 @@
             "name": "Porvoo"
           },
           "profile": {
-            "duration": 3473,
+            "duration": 3473050,
             "depth": {
               "times": [
-                1,
-                1160,
-                1810,
-                2948,
-                3470
+                910,
+                1160030,
+                1810030,
+                2947750,
+                3470030
               ],
               "values": [
                 137,
@@ -56,8 +56,8 @@
             },
             "temperature": {
               "times": [
-                8,
-                3473
+                8050,
+                3473050
               ],
               "values": [
                 298,
@@ -67,11 +67,11 @@
             "pressures": [
               {
                 "times": [
-                  1,
-                  1160,
-                  1810,
-                  2948,
-                  3470
+                  910,
+                  1160030,
+                  1810030,
+                  2947750,
+                  3470030
                 ],
                 "values": [
                   2073,
@@ -85,11 +85,11 @@
             ],
             "ndl": {
               "times": [
-                1,
-                1160,
-                1810,
-                2948,
-                3470
+                910,
+                1160030,
+                1810030,
+                2947750,
+                3470030
               ],
               "values": [
                 6000,
@@ -101,8 +101,8 @@
             },
             "tts": {
               "times": [
-                1,
-                2948
+                910,
+                2947750
               ],
               "values": [
                 12,
@@ -111,7 +111,7 @@
             },
             "gradient_factor": {
               "times": [
-                3470
+                3470030
               ],
               "values": [
                 0
@@ -119,11 +119,11 @@
             },
             "surface_gradient_factor": {
               "times": [
-                1,
-                1160,
-                1810,
-                2948,
-                3470
+                910,
+                1160030,
+                1810030,
+                2947750,
+                3470030
               ],
               "values": [
                 0,
@@ -135,7 +135,7 @@
             },
             "events": [
               {
-                "time": 0,
+                "time": 40,
                 "type": "gas_switch",
                 "gas_number": 0
               }
diff --git a/fixtures/suunto_json/suunto-ocean.divejson b/fixtures/suunto_json/suunto-ocean.divejson
index 481c2d9..dbaf918 100644
--- a/fixtures/suunto_json/suunto-ocean.divejson
+++ b/fixtures/suunto_json/suunto-ocean.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-05T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.2.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -40,12 +40,12 @@
             "name": "Suunto Ocean"
           },
           "profile": {
-            "duration": 4300,
+            "duration": 4299990,
             "depth": {
               "times": [
-                0,
-                1200,
-                4000
+                160,
+                1200000,
+                4000020
               ],
               "values": [
                 145,
@@ -55,7 +55,7 @@
             },
             "ceiling": {
               "times": [
-                1200
+                1200000
               ],
               "values": [
                 300
@@ -63,7 +63,7 @@
             },
             "temperature": {
               "times": [
-                60
+                60000
               ],
               "values": [
                 224
@@ -72,10 +72,10 @@
             "pressures": [
               {
                 "times": [
-                  0,
-                  1200,
-                  4000,
-                  4300
+                  160,
+                  1200000,
+                  4000020,
+                  4299990
                 ],
                 "values": [
                   2116,
@@ -88,22 +88,22 @@
             ],
             "events": [
               {
-                "time": 0,
+                "time": 20,
                 "type": "gas_switch",
                 "gas_number": 0
               },
               {
-                "time": 1230,
+                "time": 1230000,
                 "type": "ceiling_violation",
                 "label": "Ceiling Broken"
               },
               {
-                "time": 2075,
+                "time": 2075190,
                 "type": "gas_switch",
                 "gas_number": 1
               },
               {
-                "time": 3840,
+                "time": 3840000,
                 "type": "safety_stop"
               }
             ]
diff --git a/fixtures/suunto_xml/freedive.divejson b/fixtures/suunto_xml/freedive.divejson
index be41d27..b6c5aba 100644
--- a/fixtures/suunto_xml/freedive.divejson
+++ b/fixtures/suunto_xml/freedive.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-07T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.3.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -14,7 +14,6 @@
       "max_depth": 8.53,
       "avg_depth": 4.89,
       "bottom_temperature": 29.0,
-      "surface_pressure": 1.058,
       "recordings": [
         {
           "device": {
@@ -25,13 +24,14 @@
             "dive_number": 1
           },
           "mode": "freedive",
+          "surface_pressure": 1.058,
           "profile": {
-            "duration": 33,
+            "duration": 33000,
             "depth": {
               "times": [
-                1,
-                20,
-                33
+                1000,
+                20000,
+                33000
               ],
               "values": [
                 127,
@@ -41,9 +41,9 @@
             },
             "temperature": {
               "times": [
-                1,
-                20,
-                33
+                1000,
+                20000,
+                33000
               ],
               "values": [
                 299,
diff --git a/fixtures/suunto_xml/nitrox-deco.divejson b/fixtures/suunto_xml/nitrox-deco.divejson
index 04d2493..b8623fc 100644
--- a/fixtures/suunto_xml/nitrox-deco.divejson
+++ b/fixtures/suunto_xml/nitrox-deco.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-07T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.3.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -14,11 +14,6 @@
       "max_depth": 31.95,
       "avg_depth": 16.6,
       "bottom_temperature": 25.0,
-      "cns_start": 0.0,
-      "cns_end": 20.0,
-      "otu_start": 0.0,
-      "otu_end": 43.0,
-      "surface_pressure": 1.063,
       "cylinders": [
         {
           "volume": 22.0,
@@ -26,14 +21,14 @@
           "end_pressure": 144.625,
           "oxygen": 21.0,
           "helium": 0.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 0
         },
         {
           "volume": 11.0,
           "oxygen": 52.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 1
         }
       ],
@@ -50,18 +45,23 @@
           "deco_model": {
             "conservatism": -1
           },
+          "surface_pressure": 1.063,
+          "cns_start": 0.0,
+          "cns_end": 20.0,
+          "otu_start": 0.0,
+          "otu_end": 43.0,
           "profile": {
-            "duration": 3485,
+            "duration": 3485000,
             "depth": {
               "times": [
-                1,
-                11,
-                241,
-                1112,
-                1122,
-                1583,
-                1593,
-                3485
+                1000,
+                11000,
+                241000,
+                1112000,
+                1122000,
+                1583000,
+                1593000,
+                3485000
               ],
               "values": [
                 141,
@@ -76,10 +76,10 @@
             },
             "ceiling": {
               "times": [
-                1112,
-                1122,
-                1583,
-                1593
+                1112000,
+                1122000,
+                1583000,
+                1593000
               ],
               "values": [
                 300,
@@ -90,14 +90,14 @@
             },
             "temperature": {
               "times": [
-                1,
-                11,
-                241,
-                1112,
-                1122,
-                1583,
-                1593,
-                3485
+                1000,
+                11000,
+                241000,
+                1112000,
+                1122000,
+                1583000,
+                1593000,
+                3485000
               ],
               "values": [
                 290,
@@ -113,12 +113,12 @@
             "pressures": [
               {
                 "times": [
-                  1,
-                  11,
-                  241,
-                  1112,
-                  1122,
-                  1583
+                  1000,
+                  11000,
+                  241000,
+                  1112000,
+                  1122000,
+                  1583000
                 ],
                 "values": [
                   2114,
@@ -138,7 +138,7 @@
                 "gas_number": 0
               },
               {
-                "time": 1592,
+                "time": 1592000,
                 "type": "gas_switch",
                 "gas_number": 1
               }
diff --git a/fixtures/suunto_xml/refusals.divejson b/fixtures/suunto_xml/refusals.divejson
index 8d9866f..02f2cd5 100644
--- a/fixtures/suunto_xml/refusals.divejson
+++ b/fixtures/suunto_xml/refusals.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-07T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.3.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -13,10 +13,6 @@
       "duration": 1800,
       "max_depth": 20.5,
       "bottom_temperature": 24.0,
-      "cns_start": 0.0,
-      "cns_end": 12.0,
-      "otu_start": 0.0,
-      "otu_end": 30.0,
       "cylinders": [
         {
           "volume": 12.0,
@@ -30,7 +26,7 @@
           "end_pressure": 120.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 1
         }
       ],
@@ -47,12 +43,16 @@
           "deco_model": {
             "conservatism": 0
           },
+          "cns_start": 0.0,
+          "cns_end": 12.0,
+          "otu_start": 0.0,
+          "otu_end": 30.0,
           "profile": {
-            "duration": 21,
+            "duration": 21000,
             "depth": {
               "times": [
-                1,
-                21
+                1000,
+                21000
               ],
               "values": [
                 186,
@@ -61,9 +61,9 @@
             },
             "temperature": {
               "times": [
-                1,
-                11,
-                21
+                1000,
+                11000,
+                21000
               ],
               "values": [
                 245,
@@ -73,7 +73,7 @@
             },
             "events": [
               {
-                "time": 1200,
+                "time": 1200000,
                 "type": "gas_switch",
                 "gas_number": 1
               }
diff --git a/fixtures/suunto_xml/suunto-d5.divejson b/fixtures/suunto_xml/suunto-d5.divejson
index 7590aab..42f684b 100644
--- a/fixtures/suunto_xml/suunto-d5.divejson
+++ b/fixtures/suunto_xml/suunto-d5.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-07T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.3.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -14,17 +14,12 @@
       "max_depth": 32.41,
       "avg_depth": 17.73,
       "bottom_temperature": 22.0,
-      "cns_start": 0.0,
-      "cns_end": 4.0,
-      "otu_start": 0.0,
-      "otu_end": 10.0,
-      "surface_pressure": 1.049,
       "cylinders": [
         {
           "volume": 12.0,
           "oxygen": 21.0,
           "helium": 0.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 0
         }
       ],
@@ -41,17 +36,22 @@
           "deco_model": {
             "conservatism": 0
           },
+          "surface_pressure": 1.049,
+          "cns_start": 0.0,
+          "cns_end": 4.0,
+          "otu_start": 0.0,
+          "otu_end": 10.0,
           "profile": {
-            "duration": 2001,
+            "duration": 2001000,
             "depth": {
               "times": [
-                1,
-                11,
-                21,
-                241,
-                251,
-                1991,
-                2001
+                1000,
+                11000,
+                21000,
+                241000,
+                251000,
+                1991000,
+                2001000
               ],
               "values": [
                 186,
@@ -65,13 +65,13 @@
             },
             "temperature": {
               "times": [
-                1,
-                11,
-                21,
-                241,
-                251,
-                1991,
-                2001
+                1000,
+                11000,
+                21000,
+                241000,
+                251000,
+                1991000,
+                2001000
               ],
               "values": [
                 237,
diff --git a/fixtures/suunto_xml/unlabelled-pressure.divejson b/fixtures/suunto_xml/unlabelled-pressure.divejson
index c9acd10..d7c8a22 100644
--- a/fixtures/suunto_xml/unlabelled-pressure.divejson
+++ b/fixtures/suunto_xml/unlabelled-pressure.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-07T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.3.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -12,17 +12,12 @@
       "started_at": "2025-05-01T09:58:12.5",
       "notes": "Shore entry; the pod was paired to the computer but the app never wrote which tank it was on.",
       "bottom_temperature": 22.0,
-      "cns_start": 0.0,
-      "cns_end": 3.0,
-      "otu_start": 0.0,
-      "otu_end": 8.0,
-      "surface_pressure": 1.013,
       "cylinders": [
         {
           "volume": 12.0,
           "oxygen": 21.0,
           "helium": 0.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 0
         },
         {
@@ -41,14 +36,19 @@
           "deco_model": {
             "conservatism": 0
           },
+          "surface_pressure": 1.013,
+          "cns_start": 0.0,
+          "cns_end": 3.0,
+          "otu_start": 0.0,
+          "otu_end": 8.0,
           "profile": {
-            "duration": 40,
+            "duration": 40000,
             "depth": {
               "times": [
-                10,
-                20,
-                30,
-                40
+                10000,
+                20000,
+                30000,
+                40000
               ],
               "values": [
                 142,
@@ -59,7 +59,7 @@
             },
             "ceiling": {
               "times": [
-                30
+                30000
               ],
               "values": [
                 450
@@ -67,10 +67,10 @@
             },
             "temperature": {
               "times": [
-                10,
-                20,
-                30,
-                40
+                10000,
+                20000,
+                30000,
+                40000
               ],
               "values": [
                 224,
@@ -82,9 +82,9 @@
             "pressures": [
               {
                 "times": [
-                  10,
-                  20,
-                  40
+                  10000,
+                  20000,
+                  40000
                 ],
                 "values": [
                   1980,
diff --git a/fixtures/uddf/divelogs.divejson b/fixtures/uddf/divelogs.divejson
index eb9d91a..9175ab5 100644
--- a/fixtures/uddf/divelogs.divejson
+++ b/fixtures/uddf/divelogs.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-05T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.1.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -31,14 +31,14 @@
       "recordings": [
         {
           "profile": {
-            "duration": 16,
+            "duration": 16000,
             "depth": {
               "times": [
                 0,
-                4,
-                8,
-                12,
-                16
+                4000,
+                8000,
+                12000,
+                16000
               ],
               "values": [
                 0,
@@ -50,7 +50,7 @@
             },
             "temperature": {
               "times": [
-                4
+                4000
               ],
               "values": [
                 244
diff --git a/fixtures/uddf/legacy-writer.divejson b/fixtures/uddf/legacy-writer.divejson
index 1532390..1748aeb 100644
--- a/fixtures/uddf/legacy-writer.divejson
+++ b/fixtures/uddf/legacy-writer.divejson
@@ -4,13 +4,13 @@
   "exported_at": "2026-09-05T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.1.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
       "uuid": "2d15ba8f-aad9-59bb-ba1a-9aa35a26adde",
       "number": 12,
-      "started_at": "2002-06-18T00:00:00",
+      "started_at": "2002-06-18",
       "duration": 2400,
       "notes": "Four writer habits in one dive: element names in upper case, a whole-percent oxygen fraction, a tank volume in litres where UDDF specifies cubic metres, and a midnight dive whose time of day the exporter never wrote.",
       "max_depth": 18.4,
@@ -28,14 +28,16 @@
       "recordings": [
         {
           "profile": {
-            "duration": 120,
+            "duration": 120000,
             "depth": {
               "times": [
-                30,
-                120
+                30000,
+                30400,
+                120000
               ],
               "values": [
                 250,
+                310,
                 1840
               ]
             }
diff --git a/fixtures/uddf/opendiving.divejson b/fixtures/uddf/opendiving.divejson
index e5f9897..e15e561 100644
--- a/fixtures/uddf/opendiving.divejson
+++ b/fixtures/uddf/opendiving.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-05T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.1.0"
+    "version": "0.12.0"
   },
   "diver": {
     "uuid": "d8b9bbd3-c66e-52c1-b8e8-d908f921af7e",
@@ -31,7 +31,6 @@
       "visibility": 20.0,
       "weight": 6.0,
       "altitude": 0,
-      "surface_pressure": 1.013,
       "trip_uuid": "0198a6f0-4444-7001-8000-000000000001",
       "site_uuids": [
         "0198a6f0-3333-7001-8000-000000000001"
@@ -48,7 +47,7 @@
           "end_pressure": 60.0,
           "oxygen": 21.0,
           "helium": 0.0,
-          "po2_limit": 1.4,
+          "ppo2_limit": 1.4,
           "gas_number": 0
         },
         {
@@ -57,7 +56,7 @@
           "end_pressure": 150.0,
           "oxygen": 50.0,
           "helium": 0.0,
-          "po2_limit": 1.6,
+          "ppo2_limit": 1.6,
           "gas_number": 1
         }
       ],
@@ -67,16 +66,17 @@
             "brand": "Suunto",
             "name": "Ocean"
           },
+          "surface_pressure": 1.013,
           "profile": {
-            "duration": 2880,
+            "duration": 2880000,
             "depth": {
               "times": [
                 0,
-                120,
-                600,
-                2400,
-                2700,
-                2880
+                120000,
+                600000,
+                2400000,
+                2700000,
+                2880000
               ],
               "values": [
                 0,
@@ -90,8 +90,8 @@
             "temperature": {
               "times": [
                 0,
-                120,
-                600
+                120000,
+                600000
               ],
               "values": [
                 244,
@@ -103,9 +103,9 @@
               {
                 "times": [
                   0,
-                  120,
-                  600,
-                  2880
+                  120000,
+                  600000,
+                  2880000
                 ],
                 "values": [
                   2100,
@@ -117,8 +117,8 @@
               },
               {
                 "times": [
-                  2400,
-                  2700
+                  2400000,
+                  2700000
                 ],
                 "values": [
                   2000,
@@ -134,16 +134,16 @@
                 "gas_number": 0
               },
               {
-                "time": 600,
+                "time": 600000,
                 "label": "Deepest point"
               },
               {
-                "time": 2400,
+                "time": 2400000,
                 "type": "gas_switch",
                 "gas_number": 1
               },
               {
-                "time": 2700,
+                "time": 2700000,
                 "type": "safety_stop"
               }
             ]
diff --git a/fixtures/uddf/shearwater-cloud-cns.divejson b/fixtures/uddf/shearwater-cloud-cns.divejson
index 97ec00a..fa3fc31 100644
--- a/fixtures/uddf/shearwater-cloud-cns.divejson
+++ b/fixtures/uddf/shearwater-cloud-cns.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-12T00:48:30+03:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.5.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -15,7 +15,6 @@
       "notes": "Summary:\n\nEnvironment:\n\nGas:\n\nGear:\n\nIssues:",
       "max_depth": 19.1,
       "avg_depth": 11.0477839,
-      "surface_pressure": 1.019,
       "gear_uuids": [
         "bae2b91d-674c-5d38-875d-e3d3f69da1af"
       ],
@@ -53,26 +52,27 @@
             "gf_low": 50,
             "gf_high": 85
           },
+          "surface_pressure": 1.019,
           "profile": {
-            "duration": 2940,
+            "duration": 2940000,
             "depth": {
               "times": [
                 0,
-                30,
-                310,
-                790,
-                840,
-                900,
-                1500,
-                2000,
-                2780,
-                2840,
-                2850,
-                2860,
-                2870,
-                2920,
-                2930,
-                2940
+                30000,
+                310000,
+                790000,
+                840000,
+                900000,
+                1500000,
+                2000000,
+                2780000,
+                2840000,
+                2850000,
+                2860000,
+                2870000,
+                2920000,
+                2930000,
+                2940000
               ],
               "values": [
                 230,
@@ -96,21 +96,21 @@
             "temperature": {
               "times": [
                 0,
-                30,
-                310,
-                790,
-                840,
-                900,
-                1500,
-                2000,
-                2780,
-                2840,
-                2850,
-                2860,
-                2870,
-                2920,
-                2930,
-                2940
+                30000,
+                310000,
+                790000,
+                840000,
+                900000,
+                1500000,
+                2000000,
+                2780000,
+                2840000,
+                2850000,
+                2860000,
+                2870000,
+                2920000,
+                2930000,
+                2940000
               ],
               "values": [
                 300,
@@ -134,21 +134,21 @@
             "ndl": {
               "times": [
                 0,
-                30,
-                310,
-                790,
-                840,
-                900,
-                1500,
-                2000,
-                2780,
-                2840,
-                2850,
-                2860,
-                2870,
-                2920,
-                2930,
-                2940
+                30000,
+                310000,
+                790000,
+                840000,
+                900000,
+                1500000,
+                2000000,
+                2780000,
+                2840000,
+                2850000,
+                2860000,
+                2870000,
+                2920000,
+                2930000,
+                2940000
               ],
               "values": [
                 5940,
@@ -172,18 +172,18 @@
             "ppo2": {
               "times": [
                 0,
-                30,
-                310,
-                790,
-                840,
-                900,
-                1500,
-                2000,
-                2780,
-                2840,
-                2850,
-                2870,
-                2930
+                30000,
+                310000,
+                790000,
+                840000,
+                900000,
+                1500000,
+                2000000,
+                2780000,
+                2840000,
+                2850000,
+                2870000,
+                2930000
               ],
               "values": [
                 40,
@@ -203,20 +203,20 @@
             },
             "cns": {
               "times": [
-                310,
-                790,
-                840,
-                900,
-                1500,
-                2000,
-                2780,
-                2840,
-                2850,
-                2860,
-                2870,
-                2920,
-                2930,
-                2940
+                310000,
+                790000,
+                840000,
+                900000,
+                1500000,
+                2000000,
+                2780000,
+                2840000,
+                2850000,
+                2860000,
+                2870000,
+                2920000,
+                2930000,
+                2940000
               ],
               "values": [
                 10,
@@ -238,15 +238,15 @@
             "gradient_factor": {
               "times": [
                 0,
-                30,
-                2780,
-                2840,
-                2850,
-                2860,
-                2870,
-                2920,
-                2930,
-                2940
+                30000,
+                2780000,
+                2840000,
+                2850000,
+                2860000,
+                2870000,
+                2920000,
+                2930000,
+                2940000
               ],
               "values": [
                 0,
diff --git a/fixtures/uddf/shearwater-cloud.divejson b/fixtures/uddf/shearwater-cloud.divejson
index 9e80428..caeb493 100644
--- a/fixtures/uddf/shearwater-cloud.divejson
+++ b/fixtures/uddf/shearwater-cloud.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-05T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.4.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -15,7 +15,6 @@
       "notes": "Summary:\n\nEnvironment:\n\nGas:\n\nGear:\n\nIssues:",
       "max_depth": 4.0,
       "avg_depth": 2.70000029,
-      "surface_pressure": 1.019,
       "gear_uuids": [
         "bae2b91d-674c-5d38-875d-e3d3f69da1af"
       ],
@@ -41,22 +40,23 @@
             "gf_low": 50,
             "gf_high": 85
           },
+          "surface_pressure": 1.019,
           "profile": {
-            "duration": 180,
+            "duration": 180000,
             "depth": {
               "times": [
                 0,
-                10,
-                20,
-                30,
-                40,
-                60,
-                80,
-                100,
-                120,
-                140,
-                160,
-                180
+                10000,
+                20000,
+                30000,
+                40000,
+                60000,
+                80000,
+                100000,
+                120000,
+                140000,
+                160000,
+                180000
               ],
               "values": [
                 130,
@@ -76,17 +76,17 @@
             "temperature": {
               "times": [
                 0,
-                10,
-                20,
-                30,
-                40,
-                60,
-                80,
-                100,
-                120,
-                140,
-                160,
-                180
+                10000,
+                20000,
+                30000,
+                40000,
+                60000,
+                80000,
+                100000,
+                120000,
+                140000,
+                160000,
+                180000
               ],
               "values": [
                 330,
@@ -105,17 +105,17 @@
             },
             "ndl": {
               "times": [
-                10,
-                20,
-                30,
-                40,
-                60,
-                80,
-                100,
-                120,
-                140,
-                160,
-                180
+                10000,
+                20000,
+                30000,
+                40000,
+                60000,
+                80000,
+                100000,
+                120000,
+                140000,
+                160000,
+                180000
               ],
               "values": [
                 5940,
@@ -134,16 +134,16 @@
             "ppo2": {
               "times": [
                 0,
-                10,
-                20,
-                30,
-                40,
-                60,
-                100,
-                120,
-                140,
-                160,
-                180
+                10000,
+                20000,
+                30000,
+                40000,
+                60000,
+                100000,
+                120000,
+                140000,
+                160000,
+                180000
               ],
               "values": [
                 38,
@@ -162,8 +162,8 @@
             "gradient_factor": {
               "times": [
                 0,
-                160,
-                180
+                160000,
+                180000
               ],
               "values": [
                 0,
diff --git a/fixtures/uddf/subsurface.divejson b/fixtures/uddf/subsurface.divejson
index e64e305..7075018 100644
--- a/fixtures/uddf/subsurface.divejson
+++ b/fixtures/uddf/subsurface.divejson
@@ -4,7 +4,7 @@
   "exported_at": "2026-09-05T00:00:00+00:00",
   "generator": {
     "name": "divejson convert",
-    "version": "0.1.0"
+    "version": "0.12.0"
   },
   "dives": [
     {
@@ -32,17 +32,17 @@
       "recordings": [
         {
           "profile": {
-            "duration": 4300,
+            "duration": 4300000,
             "depth": {
               "times": [
                 0,
-                10,
-                20,
-                30,
-                40,
-                80,
-                170,
-                4300
+                10000,
+                20000,
+                30000,
+                40000,
+                80000,
+                170000,
+                4300000
               ],
               "values": [
                 145,
@@ -57,8 +57,8 @@
             },
             "temperature": {
               "times": [
-                30,
-                80
+                30000,
+                80000
               ],
               "values": [
                 244,
@@ -94,12 +94,12 @@
       "recordings": [
         {
           "profile": {
-            "duration": 2880,
+            "duration": 2880000,
             "depth": {
               "times": [
                 0,
-                576,
-                2880
+                576000,
+                2880000
               ],
               "values": [
                 0,
diff --git a/fixtures/valid/technical-dive.divejson b/fixtures/valid/technical-dive.divejson
index 83a1e88..20358d0 100644
--- a/fixtures/valid/technical-dive.divejson
+++ b/fixtures/valid/technical-dive.divejson
@@ -479,6 +479,11 @@
       "site_uuids": [
         "0198a6f0-1111-7040-8000-000000000040"
       ],
+      "recordings": [
+        {
+          "cns_end": 14.0
+        }
+      ],
       "notes": "Logged by hand on the boat: the day, and no time of day."
     }
   ],
diff --git a/fixtures/write/uddf/technical-dive.divejson b/fixtures/write/uddf/technical-dive.divejson
index 83a1e88..20358d0 100644
--- a/fixtures/write/uddf/technical-dive.divejson
+++ b/fixtures/write/uddf/technical-dive.divejson
@@ -479,6 +479,11 @@
       "site_uuids": [
         "0198a6f0-1111-7040-8000-000000000040"
       ],
+      "recordings": [
+        {
+          "cns_end": 14.0
+        }
+      ],
       "notes": "Logged by hand on the boat: the day, and no time of day."
     }
   ],
diff --git a/fixtures/write/uddf/technical-dive.uddf b/fixtures/write/uddf/technical-dive.uddf
index 29f6f4a..3008eb6 100644
--- a/fixtures/write/uddf/technical-dive.uddf
+++ b/fixtures/write/uddf/technical-dive.uddf
@@ -3,7 +3,7 @@
   <generator>
     <name>divejson convert</name>
     <type>converter</type>
-    <version>0.3.0</version>
+    <version>0.12.0</version>
     <datetime>2026-08-28T12:00:00Z</datetime>
   </generator>
   <diver>
@@ -309,6 +309,19 @@
           <diveduration>0</diveduration>
         </informationafterdive>
       </dive>
+      <dive id="dive-0198a6f0-1111-7012-8000-000000000012">
+        <informationbeforedive>
+          <link ref="site-0198a6f0-1111-7040-8000-000000000040" />
+          <datetime>2026-07-05</datetime>
+        </informationbeforedive>
+        <informationafterdive>
+          <greatestdepth>21.5</greatestdepth>
+          <notes>
+            <para>Logged by hand on the boat: the day, and no time of day.</para>
+          </notes>
+          <diveduration>2880</diveduration>
+        </informationafterdive>
+      </dive>
     </repetitiongroup>
   </profiledata>
 </uddf>

From 0c5e47b8e6ca29757372c0aebdab595aaf4d84f5 Mon Sep 17 00:00:00 2001
From: Aleksei Vesnin <aleksei@vesnin.me>
Date: Fri, 25 Sep 2026 06:32:43 +0300
Subject: [PATCH 7/9] Account for a written recording that carried nothing UDDF
 holds

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 tests/test_uddf_write_fixtures.py | 48 +++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/tests/test_uddf_write_fixtures.py b/tests/test_uddf_write_fixtures.py
index e753dd8..ea25c5a 100644
--- a/tests/test_uddf_write_fixtures.py
+++ b/tests/test_uddf_write_fixtures.py
@@ -127,6 +127,9 @@
             "trips/0/notes",
             # `<setmarker>` is one string, so a labelled bookmark keeps the type.
             "dives/0/recordings/0/profile/events/6/label",
+            # The third dive's one recording carries a CNS end and nothing else, and UDDF
+            # has no slot for it, so none of the recording is written and none comes back.
+            "dives/2/recordings",
             # UDDF records no cylinder numbering, so the labels come back as positions.
             *(f"dives/0/cylinders/{index}/gas_number" for index in range(4)),
             *(f"dives/0/recordings/0/profile/pressures/{index}/gas_number" for index in range(4)),
@@ -287,14 +290,55 @@ def test_the_report_names_everything_that_changed(source) -> None:
     written = write_uddf(document)
     read_back = convert(written.data, format="uddf").document
 
+    before, after = _compared(document), _compared(read_back)
     unreported = [
         path
-        for path in _differences(_compared(document), _compared(read_back))
-        if path not in RETURNED[source.stem] and not _reported(path, written.notes)
+        for path in _differences(before, after)
+        if path not in RETURNED[source.stem]
+        and not _reported(path, written.notes)
+        and not _wholly_reported(path, before, after, written.notes)
     ]
     assert unreported == []
 
 
+def _at(document: Any, path: str) -> Any:
+    """The value at a `dives/2/recordings` path, or `_MISSING` where there is none."""
+    node = document
+    for part in path.split("/"):
+        if isinstance(node, dict) and part in node:
+            node = node[part]
+        elif isinstance(node, list) and part.isdigit() and int(part) < len(node):
+            node = node[int(part)]
+        else:
+            return _MISSING
+    return node
+
+
+_MISSING = object()
+
+
+def _leaves(value: Any, path: str) -> list[str]:
+    if isinstance(value, dict):
+        return [leaf for key, child in value.items() for leaf in _leaves(child, f"{path}/{key}")]
+    if isinstance(value, list):
+        return [leaf for index, child in enumerate(value) for leaf in _leaves(child, f"{path}/{index}")]
+    return [path]
+
+
+def _wholly_reported(path: str, before: Any, after: Any, notes) -> bool:
+    """A record that did not come back at all is accounted for when everything it carried is.
+
+    `_differences` names a vanished member by its own path, and a writer reports from the
+    record — a readout-only recording's `cns_end`, one level down — so a member absent from
+    the read-back is matched on its leaves. A member that came back *changed* is not: it has
+    to be named where it differs.
+    """
+    if _at(after, path) is not _MISSING:
+        return False
+    leaves = _leaves(_at(before, path), path)
+    return bool(leaves) and all(_reported(leaf, notes) for leaf in leaves)
+
+
 # -- agreement with the reference writer ------------------------------------------------
 
 # The same logbook written twice: `fixtures/uddf/opendiving.uddf` is what DiveJSON's

From 4dffb1863151f59e1dd58ea50fa48897db160fd5 Mon Sep 17 00:00:00 2001
From: Aleksei Vesnin <aleksei@vesnin.me>
Date: Fri, 25 Sep 2026 06:43:01 +0300
Subject: [PATCH 8/9] Hold the .ssrf clock's product to the representability
 bound, and rewrap two docstrings

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 divejson/converter.py    | 12 +++++++-----
 divejson/ssrf.py         | 12 ++++++++++--
 tests/test_ssrf_units.py | 15 +++++++++++++++
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/divejson/converter.py b/divejson/converter.py
index 7004082..970073c 100644
--- a/divejson/converter.py
+++ b/divejson/converter.py
@@ -402,8 +402,9 @@ def channel_floor(member: str) -> int | None:
 
     A channel is a `$ref` to a series definition rather than a member carrying constraints
     of its own, so `recorded` is not the question to ask about one — every call site it has
-    names a record's own member, and `_floor` finds nothing under a reference. This resolves the reference instead: the six decompression readouts share a
-    definition whose `values` floor at zero, because no-decompression time, time to surface,
+    names a record's own member, and `_floor` finds nothing under a reference. This
+    resolves the reference instead: the six decompression readouts share a definition whose
+    `values` floor at zero, because no-decompression time, time to surface,
     ppO₂, CNS and a gradient factor have no negative reading and a source that writes one is
     spelling absence in the only space it had. Depth, ceiling and temperature share the
     signed definition and floor at nothing.
@@ -479,7 +480,8 @@ def recorded(value: Decimal | int | None, *, record: str, member: str) -> bool:
 # Divided by 1000, the largest factor any adapter applies to a number it has read — UDDF's
 # cubic metres to litres, every source's seconds to the profile axis's milliseconds, and
 # above any channel scale — so that checking the value as the text is read also covers
-# every value derived from it.
+# every value derived from it. A reader that multiplies before that factor, as `.ssrf`'s
+# `M:SS` does minutes into seconds, checks its own product against this bound too.
 MAX_MAGNITUDE = Decimal(sys.float_info.max) / 1000
 
 # §5.1's grain for elapsed time on a profile axis — a Series' `times`, a profile's
@@ -556,8 +558,8 @@ def in_seconds(milliseconds: int) -> str:
     The report speaks seconds because that is what every source format and every dive
     computer's display does; the document's milliseconds are an encoding, and a note saying
     a waypoint is "at 1200020" would send a diver looking for a number their file does not
-    contain. A whole second is written as the integer it is, so a report on a file that
-    samples whole seconds reads exactly as it did before the axis moved.
+    contain. A whole second is written as the integer it is — `30`, never `30.0` — so a
+    report on a file that samples whole seconds shows no fraction the file does not.
     """
     return format((Decimal(milliseconds) / MILLISECONDS_PER_SECOND).normalize(), "f")
 
diff --git a/divejson/ssrf.py b/divejson/ssrf.py
index 6cc549c..a9284dd 100644
--- a/divejson/ssrf.py
+++ b/divejson/ssrf.py
@@ -59,6 +59,7 @@
 
 from .converter import (
     CENTIMETRES_PER_METRE,
+    MAX_MAGNITUDE,
     MAX_NAME,
     PRODUCER_KEY,
     TENTHS_PER_UNIT,
@@ -123,14 +124,21 @@
 
 
 def _clock(raw: str) -> Decimal | None:
-    """`'66:50'` as 4010 seconds, or nothing for text that is not a `M:SS` time."""
+    """`'66:50'` as 4010 seconds, or nothing for text that is not a `M:SS` time.
+
+    The product is held to `MAX_MAGNITUDE` as well as the minutes, because a sample time
+    takes two factors past its text — sixty here and a thousand on the axis — where the
+    bound covers one: minutes that clear it can still reach the axis as a number no double
+    holds, and a time that cannot be carried is text that is not a time.
+    """
     match = _CLOCK.match(raw)
     if match is None:
         return None
     minutes = decimal_of(match.group(1))
     if minutes is None:
         return None
-    return minutes * SECONDS_PER_MINUTE + Decimal(match.group(2))
+    seconds = minutes * SECONDS_PER_MINUTE + Decimal(match.group(2))
+    return seconds if seconds <= MAX_MAGNITUDE else None
 
 
 def _calendar_date(text: str) -> bool:
diff --git a/tests/test_ssrf_units.py b/tests/test_ssrf_units.py
index e1b9dd0..6e3a6a5 100644
--- a/tests/test_ssrf_units.py
+++ b/tests/test_ssrf_units.py
@@ -107,6 +107,21 @@ def test_a_samples_clock_is_the_same_seconds_on_a_millisecond_axis(written: str,
     assert profile(f"<sample time='{written} min' depth='1.0 m'/>")["depth"]["times"] == [milliseconds]
 
 
+def test_a_clock_too_large_for_the_axis_is_not_a_time() -> None:
+    """Minutes that clear `decimal_of`'s bound still take two factors to reach the axis —
+    sixty, then a thousand — so the product is bounded too, and a sample the axis could not
+    carry as a double is dropped rather than written as a number no reader can read back."""
+    minutes = "9" * 305
+    samples = f"<sample time='0:10 min' depth='1.0 m'/><sample time='{minutes}:00 min' depth='2.0 m'/>"
+    conversion = convert(one_ssrf_computer(samples))
+    depth = profile_of(conversion.document["dives"][0])["depth"]
+    assert depth == {"times": [10_000], "values": [100]}
+    assert any(
+        "<sample time> is recorded in min with something that is not a number" in note.message
+        for note in conversion.notes
+    )
+
+
 @pytest.mark.parametrize("written", ["66", "66:5", "1:60", "66:50:00", "1.5", "66m50s"])
 def test_something_that_is_not_a_clock_is_refused_rather_than_read_as_minutes(written: str) -> None:
     """A bare `66` is the tempting one, and reading it would be a factor-of-60 guess."""

From a24dd80dfd95f2abe96db33c1006dae6ddf6876c Mon Sep 17 00:00:00 2001
From: Aleksei Vesnin <aleksei@vesnin.me>
Date: Fri, 25 Sep 2026 06:57:06 +0300
Subject: [PATCH 9/9] Say what the validator checks rather than what it stopped
 checking

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 tests/test_validate.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_validate.py b/tests/test_validate.py
index d1c0cca..5ceea40 100644
--- a/tests/test_validate.py
+++ b/tests/test_validate.py
@@ -10,8 +10,8 @@
 
 So these, and deliberately nothing else: the channels §6.4 added, the gradient-factor
 ordering §3 rule 6 states, what §3 rule 4 accepts as a recording's content, the one member
-that may hold a date as well as a date-time, the member order the validator no longer
-checks — no `invalid/` document can pin an absence of a rule — and the one uuid claim whose
+that may hold a date as well as a date-time, the member order the validator does not
+check — no `invalid/` document can pin an absence of a rule — and the one uuid claim whose
 fixture is refused for another reason by any validator that does not know its member.
 Everything already covered by a pair stays covered by the pair.
 """