diff --git a/EXPLAINER.md b/EXPLAINER.md
index 764f67b..e1d3c73 100644
--- a/EXPLAINER.md
+++ b/EXPLAINER.md
@@ -6,7 +6,7 @@ Authors:
 - Francois Beaufort
 
 Participate
-- https://github.com/w3c/web-nfc/issues/ 
+- https://github.com/w3c/web-nfc/issues/
 - https://lists.w3.org/Archives/Public/public-web-nfc/
 
 ## Introduction
@@ -92,17 +92,17 @@ when required, about granting access to Web NFC. It means sending and receiving
 info when users tap NFC devices can be done smoothly once permission is granted.
 
 ```js
-const reader = new NDEFReader();
- 
+const ndef = new NDEFReader();
+
 async function startScanning() {
-  await reader.scan();
-  reader.onreading = event => {
+  await ndef.scan();
+  ndef.onreading = event => {
     /* handle NDEF messages */
   };
 }
- 
+
 const nfcPermissionStatus = await navigator.permissions.query({ name: "nfc" });
-if (permissionStatus.state === "granted") {
+if (nfcPermissionStatus.state === "granted") {
   // NFC access was previously granted, so we can start NFC scanning now.
   startScanning();
 } else {
@@ -123,13 +123,13 @@ USB](https://wicg.github.io/webusb/) in that it offers secure low level access
 with no magic and instead exposes data as a DataView as well as requires text to
 be encoded and decoded using TextEncoder/TextDecoder, which allows handling
 cases where the text might even be in UTF-16 do to existing real life
-implementations. 
+implementations.
 
 ```js
-const reader = new NDEFReader();
+const ndef = new NDEFReader();
 
-await reader.scan({ recordType: "example.com:smart-poster" });
-reader.onreading = event => {
+await ndef.scan();
+ndef.onreading = event => {
   const externalRecord = event.message.records.find(
     record => record.type == "example.com:smart-poster"
   );
@@ -162,13 +162,12 @@ const abortController = new AbortController();
 abortController.signal.onabort = event => {
   // All NFC operations have been aborted.
 };
- 
-const reader = new NDEFReader();
-await reader.scan({ signal: abortController.signal });
- 
-const writer = new NDEFWriter();
-await writer.push("foo", { signal: abortController.signal });
- 
+
+const ndef = new NDEFReader();
+await ndef.scan({ signal: abortController.signal });
+
+await ndef.write("foo", { signal: abortController.signal });
+
 document.querySelector("#abortButton").onclick = event => {
   abortController.abort();
 };
@@ -228,13 +227,11 @@ same API, and have it loaded as a separate module. People working on Web
 Assembly are also advocating for this patterns as it might be able to turn such
 globals into modules in the future, at least when accessed from WASM.
 
-### Separate objects for reader/writer
+### Common vs separate objects for reader/writer
+
+The reader and writer objects existed separately when scan filters were supported,
+but after filters have been abandoned, they have been merged into one single object.
 
-The reader and writer objects could have been merged into one single object, but
-as we allow multiple scans with filters to be active at the same time (maybe in
-multiple places/view of the app/site) then it makes more sense to be able to use
-separate objects.
- 
 ## Considered alternatives
 
 ### Restrict to NDEF and name accordingly
diff --git a/index.html b/index.html
index 7bddc51..077e8e0 100644
--- a/index.html
+++ b/index.html
@@ -9,8 +9,9 @@
   'remove'></script>
   <script class="remove">
     var respecConfig = {
-      specStatus: "CG-DRAFT",
       shortName: "web-nfc",
+      group: "cg/web-nfc",
+      specStatus: "CG-DRAFT",
       editors: [
         {
           name: "Kenneth Rohde Christiansen",
@@ -54,8 +55,6 @@
         }
       ],
       testSuiteURI: "https://wpt.fyi/web-nfc/",
-      wg: "Web NFC Community Group",
-      wgURI: "https://www.w3.org/community/web-nfc/",
       github: "w3c/web-nfc",
       xref: "web-platform",
       localBiblio: {
@@ -181,25 +180,6 @@
   </p>
 </section>
 
-<!-- - - - - - - - - - - - - - -  Origin Trial  - - - - - - - - - - - - - - -->
-<section class="informative"> <h2>Origin Trial</h2>
-  <p>An implementation (Chromium) of this specification is currently being tested
-    in the wild to gather developer feedback. You can try out Web NFC in Chrome
-    for Android by requesting an Origin Trial token and learn more about Origin
-    Trials <a href="http://googlechrome.github.io/OriginTrials/developer-guide.html">
-    here</a>.
-  </p>
-  <p>
-    Feel free to send your feedback via GitHub or the Origin Trial process.
-  </p>
-  <p class="advisement">
-    The Origin Trial feedback is reshaping parts of the API and an updated
-    specification incorporating these changes can be found <a
-    href="https://cdn.statically.io/gh/w3c/web-nfc/draft/index.html">
-    here</a>.
-  </p>
-</section>
-
 <!-- - - - - - - - - - - - - - -  Introduction  - - - - - - - - - - - - - - -->
 <section class="informative"> <h2>Introduction</h2>
   <p>
@@ -980,13 +960,11 @@ <h4>
 
   <section><h3>Feature support</h3>
     <p>
-      Detecting if Web NFC is supported can be done by checking NDEFReader
-      and/or NDEFWriter objects. Note that this does not guarantee that NFC
-      hardware is available.
+      Detecting if Web NFC is supported can be done by checking the {{NDEFReader}}
+      object. Note that this does not guarantee that NFC hardware is available.
     </p>
     <pre class="example">
-      if ('NDEFReader' in window) { /* ... Scan NDEF Tags */ }
-      if ('NDEFWriter' in window) { /* ... Write NDEF Tags */ }
+      if ('NDEFReader' in window) { /* ... Scan and write NDEF Tags */ }
     </pre>
   </section>
 
@@ -1026,8 +1004,8 @@ <h4>
       Writing a text string to an NFC tag is straightforward.
     </p>
     <pre class="example">
-      const writer = new NDEFWriter();
-      writer.write(
+      const ndef = new NDEFReader();
+      ndef.write(
         "Hello World"
       ).then(() => {
         console.log("Message written.");
@@ -1068,28 +1046,28 @@ <h4>
       handler and one used specifically for a single write.
     </p>
     <pre class="example">
-      const reader = new NDEFReader();
+      const ndef = new NDEFReader();
       let ignoreRead = false;
 
-      reader.onreading(event => {
+      ndef.onreading = (event) => {
         if (ignoreRead) {
           return; // write pending, ignore read.
         }
 
         console.log("We read a tag, but not during pending write!");
-      }
+      };
 
       function write(data) {
         ignoreRead = true;
         return new Promise((resolve, reject) => {
-          reader.addEventListener("reading", event => {
+          ndef.addEventListener("reading", event => {
             // Check if we want to write to this tag, or reject.
-            reader.write(data).then(resolve, reject).finally(() => ignoreRead = false);
+            ndef.write(data).then(resolve, reject).finally(() => ignoreRead = false);
           }, { once: true });
         });
       }
 
-      await reader.scan();
+      await ndef.scan();
       try {
         await write("Hello World");
         console.log("We wrote to a tag!")
@@ -1106,8 +1084,8 @@ <h4>
       a certain amount of time, then you time out.
     </p>
     <pre class="example">
-      const reader = new NDEFReader();
-      reader.onreading(event => console.log("We read a tag!"));
+      const ndef = new NDEFReader();
+      ndef.onreading = (event) => console.log("We read a tag!");
 
       function write(data, { timeout } = {}) {
         return new Promise((resolve, reject) => {
@@ -1117,13 +1095,13 @@ <h4>
             setTimeout(() => ctlr.abort(), timeout);
           }
 
-          reader.addEventListener("reading", event => {
-            reader.write(data, { signal: ctlr.signal }).then(resolve, reject);
+          ndef.addEventListener("reading", event => {
+            ndef.write(data, { signal: ctlr.signal }).then(resolve, reject);
           }, { once: true });
         });
       }
 
-      await reader.scan();
+      await ndef.scan();
       try {
         // Let's wait for 5 seconds only.
         write("Hello World", { timeout: 5_000 });}
@@ -1138,16 +1116,16 @@ <h4>
   <section> <h3>Handle scanning errors</h3>
     <p>
       This example shows what happens when {{NDEFReader/scan}} promise rejects and
-      {{NDEFReader/onerror}} is fired.
+      {{NDEFReader/onreadingerror}} is fired.
     </p>
     <pre class="example">
-      const reader = new NDEFReader();
-      reader.scan().then(() => {
+      const ndef = new NDEFReader();
+      ndef.scan().then(() => {
         console.log("Scan started successfully.");
-        reader.onerror = event => {
+        ndef.onreadingerror = (event) => {
           console.log("Error! Cannot read data from the NFC tag. Try a different one?");
         };
-        reader.onreading = event => {
+        ndef.onreading = (event) => {
           console.log("NDEF message read.");
         };
       }).catch(error => {
@@ -1167,17 +1145,17 @@ <h4>
       amount of milliseconds.
     </p>
     <pre class="example">
-      const reader = new NDEFReader();
+      const ndef = new NDEFReader();
 
       function read() {
         return new Promise((resolve, reject) => {
           const ctlr = new AbortController();
           ctlr.signal.onabort = reject;
-          reader.addEventListener("reading", event => {
+          ndef.addEventListener("reading", event => {
             ctlr.abort();
             resolve(event);
           }, { once: true });
-          reader.scan({ signal: ctlr.signal }).catch(err => reject(err));
+          ndef.scan({ signal: ctlr.signal }).catch(err => reject(err));
         });
       }
 
@@ -1194,15 +1172,14 @@ <h4>
       a text message is written with the value "Hello World".
     </p>
     <pre class="example">
-      const reader = new NDEFReader();
-      await reader.scan();
-      reader.onreading = event => {
+      const ndef = new NDEFReader();
+      await ndef.scan();
+      ndef.onreading = (event) => {
         const message = event.message;
 
         if (message.records.length == 0 ||     // unformatted tag
             message.records[0].recordType == 'empty' ) {  // empty record
-          const writer = new NDEFWriter();
-          writer.write({
+          ndef.write({
             records: [{ recordType: "text", data: 'Hello World' }]
           });
           return;
@@ -1251,9 +1228,9 @@ <h4>
       a write with a custom NDEF data layout.
     </p>
     <pre class="example">
-      const reader = new NDEFReader();
-      await reader.scan();
-      reader.onreading = async event => {
+      const ndef = new NDEFReader();
+      await ndef.scan();
+      ndef.onreading = async (event) => {
         if (event.message.id !== "my-game-progress")
           return;
         console.log(`Game state: ${ JSON.stringify(event.message.records) }`);
@@ -1271,8 +1248,7 @@ <h4>
             }))
           }]
         };
-        const writer = new NDEFWriter();
-        await writer.write(newMessage);
+        await ndef.write(newMessage);
         console.log("Message written");
       };
     </pre>
@@ -1283,9 +1259,9 @@ <h4>
       Storing and receiving JSON data is easy with serialization and deserialization.
     </p>
     <pre class="example">
-      const reader = new NDEFReader();
-      await reader.scan();
-      reader.onreading = event => {
+      const ndef = new NDEFReader();
+      await ndef.scan();
+      ndef.onreading = (event) => {
         const decoder = new TextDecoder();
         for (const record of event.message.records) {
           if (record.mediaType === 'application/json') {
@@ -1296,9 +1272,8 @@ <h4>
         }
       };
 
-      const writer = new NDEFWriter();
       const encoder = new TextEncoder();
-      writer.write({
+      ndef.write({
         records: [
           {
             recordType: "mime",
@@ -1327,7 +1302,7 @@ <h4>
     <pre class="example">
       const ndef = new NDEFReader();
 
-      ndef.onreading = async event => {
+      ndef.onreading = async (event) => {
         const decoder = new TextDecoder();
         for (const record of event.message.records) {
           console.log("Record type:  " + record.recordType);
@@ -1351,11 +1326,11 @@ <h4>
       Read NDEF messages for 3 seconds by using {{NDEFScanOptions/signal}}.
     </p>
     <pre class="example">
-      const reader = new NDEFReader();
+      const ndef = new NDEFReader();
       const controller = new AbortController();
 
-      await reader.scan({ signal: controller.signal });
-      reader.onreading = event => {
+      await ndef.scan({ signal: controller.signal });
+      ndef.onreading = (event) => {
         console.log("NDEF message read.");
       };
 
@@ -1370,9 +1345,9 @@ <h4>
 
   <section> <h3>Write a smart poster message</h3>
     <pre class="example">
-      const writer = new NDEFWriter();
+      const ndef = new NDEFReader();
       const encoder = new TextEncoder();
-      writer.write({ records: [
+      ndef.write({ records: [
         {
           recordType: "smart-poster",  // Sp
           data: { records: [
@@ -1436,9 +1411,9 @@ <h4>
       borrowed from <a>smart poster</a>, but used in local application context.
     </p>
     <pre class="example">
-      const reader = new NDEFReader();
-      await reader.scan();
-      reader.onreading = event => {
+      const ndef = new NDEFReader();
+      await ndef.scan();
+      ndef.onreading = (event) => {
         const externalRecord = event.message.records.find(
           record => record.type == "example.com:smart-poster"
         );
@@ -1475,8 +1450,8 @@ <h4>
       that may even contain an <a>NDEF message</a> as payload.
     </p>
     <pre class="example">
-      const writer = new NDEFWriter();
-      writer.write({ records: [
+      const ndef = new NDEFReader();
+      ndef.write({ records: [
         {
           recordType: "example.game:a",
           data: {
@@ -1509,8 +1484,8 @@ <h4>
     </p>
     <pre class="example">
       const encoder = new TextEncoder();
-      const writer = new NDEFWriter();
-      writer.write({ records: [
+      const ndef = new NDEFReader();
+      ndef.write({ records: [
         {
           recordType: "example.com:shoppingItem", // External record
           data: {
@@ -1529,9 +1504,9 @@ <h4>
       ]});
     </pre>
     <pre class="example">
-      const reader = new NDEFReader();
-      await reader.scan();
-      reader.onreading = event => {
+      const ndef = new NDEFReader();
+      await ndef.scan();
+      ndef.onreading = (event) => {
         const shoppingItemRecord = event.message.records[0];
         if (!shoppingItemRecord ||
             shoppingItemRecord.recordType !== "example.com:shoppingItem") {
@@ -1980,30 +1955,26 @@ <h2>The <dfn>record type</dfn> string</h2>
 </section> <!-- Data types and content -->
 
 
-<section> <h2>The NDEFReader and NDEFWriter objects</h2>
-  The objects provide a way for the <a>browsing context</a> to
-  use NFC functionality.
-  They allow for writing <a>NDEF message</a>s to <a>NFC tag</a>s within range,
-  and to act on incoming <a>NDEF message</a>s from <a>NFC tag</a>s.
+<section> <h2>The NDEFReader object</h2>
+  <p>
+    The <dfn>NDEFReader</dfn> is an object that exposes NFC functionality to the
+    <a>browsing context</a>: reading <a>NDEF messages</a> when a device, such
+    as a tag, is within the magnetic induction field. Also, it is used for
+    writing <a>NDEF messages</a> to <a>NFC tag</a>s within range.
+  </p>
   <pre class="idl">
     typedef (DOMString or BufferSource or NDEFMessageInit) NDEFMessageSource;
 
-    [SecureContext, Exposed=Window]
-    interface NDEFWriter {
-      constructor();
-
-      Promise&lt;undefined&gt; write(NDEFMessageSource message,
-                                     optional NDEFWriteOptions options={});
-    };
-
     [SecureContext, Exposed=Window]
     interface NDEFReader : EventTarget {
       constructor();
 
-      attribute EventHandler onerror;
       attribute EventHandler onreading;
+      attribute EventHandler onreadingerror;
 
       Promise&lt;undefined&gt; scan(optional NDEFScanOptions options={});
+      Promise&lt;undefined&gt; write(NDEFMessageSource message,
+                                     optional NDEFWriteOptions options={});
     };
 
     [SecureContext, Exposed=Window]
@@ -2021,7 +1992,7 @@ <h2>The <dfn>record type</dfn> string</h2>
   </pre>
   <p>
     The <dfn>NDEFMessageSource</dfn> is a union type representing argument types
-    accepted by the {{NDEFWriter/write()}} method.
+    accepted by the {{NDEFReader/write()}} method.
   </p>
   <p data-dfn-for="NDEFReadingEvent">
     The <dfn>NDEFReadingEvent</dfn> is the event being dispatched on new NFC readings.
@@ -2041,10 +2012,7 @@ <h2>The <dfn>record type</dfn> string</h2>
     The serial number usually consists of 4 or 7 numbers, separated by `:`.
   </p>
   <p>
-    The <dfn>NDEFWriter</dfn> is an object used for writing data to an <a>NFC tag</a>.
-  </p>
-  <p>
-    An {{NDEFWriter}} object has the following <a data-cite=
+    An {{NDEFReader}} object has the following <a data-cite=
     "ECMASCRIPT#sec-object-internal-methods-and-internal-slots">
     internal slots</a>:
   </p>
@@ -2056,12 +2024,12 @@ <h2>The <dfn>record type</dfn> string</h2>
       <th>Description (<em>non-normative</em>)</th>
      </tr>
     </thead>
-    <tbody data-link-for="NDEFWriter">
+    <tbody data-link-for="NDEFReader">
      <tr>
       <td><dfn>[[\WriteOptions]]</dfn></td>
       <td>`null`</td>
       <td>
-        The {{NDEFWriteOptions}} value for writer.
+        The {{NDEFWriteOptions}} value for writing.
       </td>
      </tr>
      <tr>
@@ -2075,41 +2043,12 @@ <h2>The <dfn>record type</dfn> string</h2>
     </tbody>
   </table>
 
-  <p>
-    The <dfn>NDEFReader</dfn> is an object used for reading data when a device,
-    such as a tag, is within the magnetic induction field.
-  </p>
-  <p>
-    An {{NDEFReader}} object has the following <a data-cite=
-    "ECMASCRIPT#sec-object-internal-methods-and-internal-slots">
-    internal slots</a>:
-  </p>
-  <table class="simple">
-    <thead>
-     <tr>
-      <th>Internal Slot</th>
-      <th>Initial value</th>
-      <th>Description (<em>non-normative</em>)</th>
-     </tr>
-    </thead>
-    <tbody data-link-for="NDEFScanOptions">
-     <tr>
-      <tr>
-        <td><dfn>[[\Signal]]</dfn></td>
-        <td>`undefined`</td>
-        <td>
-          The {{NDEFScanOptions}}.<a>signal</a> to abort the operation.
-        </td>
-      </tr>
-    </tbody>
-  </table>
-
   <p>
     The <dfn data-dfn-for="NDEFReader">onreading</dfn> is an {{EventHandler}}
     which is called to notify that new reading is available.
   </p>
   <p>
-    The <dfn data-dfn-for="NDEFReader">onerror</dfn> is an {{EventHandler}}
+    The <dfn data-dfn-for="NDEFReader">onreadingerror</dfn> is an {{EventHandler}}
     which is called to notify that an error happened during reading.
   </p>
   <section><h3>NFC state associated with the settings object</h3>
@@ -2139,25 +2078,26 @@ <h2>The <dfn>record type</dfn> string</h2>
       </td>
      </tr>
      <tr>
-      <td><dfn>[[\ActivatedReaderList]]</dfn></td>
+      <td><dfn>[[\PendingRead]]</dfn></td>
       <td>empty <a>set</a></td>
       <td>
-        A <a>set</a> of {{NDEFReader}} instances.
+        A &lt;|promise:Promise|, |reader:NDEFReader|&gt; tuple where |promise|
+        holds a {{Promise}} and |reader| holds an {{NDEFReader}}.
       </td>
      </tr>
      <tr>
       <td><dfn>[[\PendingWrite]]</dfn></td>
       <td>empty</td>
       <td>
-        A &lt;|promise:Promise|, |writer:NDEFWriter|&gt; tuple where |promise|
-        holds a pending {{Promise}} and |writer| holds an {{NDEFWriter}}.
+        A &lt;|promise:Promise|, |writer:NDEFReader|&gt; tuple where |promise|
+        holds a pending {{Promise}} and |writer| holds an {{NDEFReader}}.
       </td>
       </tr>
     </tbody>
   </table>
   <p>
-    The <dfn>activated reader objects</dfn> is the value of the
-    <a>[[\ActivatedReaderList]]</a> internal slot.
+    The <dfn>pending read tuple</dfn> is the value of the
+    <a>[[\PendingRead]]</a> internal slot.
   </p>
   <p>
     The <dfn>pending write tuple</dfn> is the value of the
@@ -2256,7 +2196,7 @@ <h2>The <dfn>record type</dfn> string</h2>
     <p>
       The term <dfn id="nfc-suspended">suspended</dfn> refers to NFC
       operations being suspended, which means that no <a>NFC content</a> is
-      written by <a>NDEFWriter</a>s, and no received <a>NFC content</a> is
+      written by <a>NDEFReader</a>s, and no received <a>NFC content</a> is
       presented to any {{NDEFReader}} while being suspended.
     </p>
   </section>
@@ -2300,7 +2240,7 @@ <h2>The <dfn>record type</dfn> string</h2>
       Stop the <a>dispatch NFC content</a> steps.
     </li>
     <li>
-      Clear the <a>activated reader objects</a>.
+      Clear the <a>pending read tuple</a>.
     </li>
     <li>
       Release the NFC resources associated with |nfc| on the
@@ -2331,7 +2271,7 @@ <h3>The <dfn>NDEFWriteOptions</dfn> dictionary</h3>
     </p>
     <p>
       The <dfn>signal</dfn> property allows to abort
-      the {{NDEFWriter/write()}} operation.
+      the {{NDEFReader/write()}} operation.
     </p>
   </section>
 
@@ -2364,7 +2304,7 @@ <h3><dfn>Writing content</dfn></h3>
     <section><h3>The <strong>write()</strong> method</h3>
       <div id="steps-write">
         The
-        <dfn>NDEFWriter.write</dfn> method, when invoked, MUST run the
+        <dfn>NDEFReader.write</dfn> method, when invoked, MUST run the
         <dfn>write a message</dfn> algorithm:
         <ol class=algorithm>
           <li>
@@ -2454,10 +2394,10 @@ <h3><dfn>Writing content</dfn></h3>
                 </p>
               </li>
               <li>
-                Set `this`.[[\WriteOptions]] to |options|.
+                Set `this`.<a>[[\WriteOptions]]</a> to |options|.
               </li>
               <li>
-                Set `this`.[[\WriteMessage]] to |output|.
+                Set `this`.<a>[[\WriteMessage]]</a> to |output|.
               </li>
               <li>
                 Set <a>pending write tuple</a> to (`this`, |p|).
@@ -2487,7 +2427,7 @@ <h3><dfn>Writing content</dfn></h3>
             Let |writer| be the <a>pending write tuple</a>'s writer.
           </li>
           <li>
-            Let |options:NDEFWriteOptions| be |writer|.[[\WriteOptions]].
+            Let |options:NDEFWriteOptions| be |writer|.<a>[[\WriteOptions]]</a>.
           </li>
           <li>
             If the <a>NFC tag</a> in proximity range does not expose
@@ -2508,7 +2448,7 @@ <h3><dfn>Writing content</dfn></h3>
                 {{"NotAllowedError"}} {{DOMException}} and return |p|.
               </li>
               <li>
-                Let |output:NDEFMessage| be |writer|.[[\WriteMessage]].
+                Let |output:NDEFMessage| be |writer|.<a>[[\WriteMessage]]</a>.
               </li>
               <li>
                 Initiate data transfer to |device| using
@@ -2550,20 +2490,21 @@ <h3><dfn>Writing content</dfn></h3>
     <div>
       To <dfn>create NDEF message</dfn> given a
       |source:NDEFMessageSource| and |context:string|, run these steps:
-      <ol class=algorithm id="create-web-nfc-message">
+      <ol class=algorithm id="create-web-nfc-message"
+          data-link-for="NDEFMessageSource">
         <li>Switch on |source:NDEFMessageSource|'s type:
           <dl>
             <dt>{{DOMString}}</dt>
             <ul>
               <li>
-                Let |textRecord| be an <a>NDEFrecord</a> initialized with its
+                Let |textRecord| be an <a>NDEFRecord</a> initialized with its
                 |recordType| set to "`text`" and |data| set to |source|.
               </li>
               <li>
                 Let |records| be the list « |textRecord| ».
               </li>
               <li>
-                Set |source|'s records to |records|.
+                Set |source|'s <a>records</a> to |records|.
               </li>
             </ul>
             <dt>{{BufferSource}}</dt>
@@ -2577,13 +2518,13 @@ <h3><dfn>Writing content</dfn></h3>
                   Let |records| be the list « |mimeRecord| ».
                 </li>
                 <li>
-                  Set |source|'s records to |records|.
+                  Set |source|'s <a>records</a> to |records|.
                 </li>
             </ul>
             <dt>{{NDEFMessageInit}}</dt>
             <ul>
               <li>
-                If |source|'s records [= list/is empty =], [= exception/throw =]
+                If |source|'s <a>records</a> [= list/is empty =], [= exception/throw =]
                 a {{TypeError}} and abort these steps.
               </li>
             </ul>
@@ -2601,7 +2542,7 @@ <h3><dfn>Writing content</dfn></h3>
         </li>
         <li>
           [= list/For each =] |record:NDEFRecordInit| in the <a>list</a>
-          |source|'s records, run the following steps:
+          |source|'s <a>records</a>, run the following steps:
           <ol>
             <li>
               Let |ndef| be the result of running <a>create NDEF record</a>
@@ -3450,9 +3391,9 @@ <h3><dfn>Writing content</dfn></h3>
       accessible to the client.
     </p>
     <p>
-      If there are any {{NDEFReader}} instances in <a>activated reader objects</a>
-      then the <a>UA</a> MUST listen to <a>NDEF message</a>s on all connected
-      NFC adapters.
+      If there is a  <a>pending read tuple</a> whose |reader| is an
+      {{NDEFReader}} instance, then the <a>UA</a> MUST listen to
+      <a>NDEF message</a>s on all connected NFC adapters.
     </p>
 
     <section> <h3>The <strong>scan()</strong> method</h3>
@@ -3474,32 +3415,33 @@ <h3><dfn>Writing content</dfn></h3>
             Let |options| be first argument.
           </li>
           <li>
-            [= list/For each =] |key| → |value| of |options|:
-            <ol>
-              <li>
-                If |key| equals "`signal`" and |value| is not `undefined`, set
-                |reader|.<a>[[\Signal]]</a> to |value|.
-              </li>
-            </ol>
+            Let |signal:AbortSignal| be the |options|’ dictionary member
+            of the same name if present, or `null` otherwise.
+          </li>
+          <li>
+            If |signal|’s [= AbortSignal/aborted flag =] is set, then reject |p|
+            with an {{"AbortError"}} {{DOMException}} and return |p|.
           </li>
           <li>
-            If |reader|.<a>[[\Signal]]</a>'s [= AbortSignal/aborted flag =] is
-            set, then reject |p| with a {{"AbortError"}} {{DOMException}}
-            and return |p|.
+            If |signal| is not `null`, then
+            <a data-cite="dom#abortsignal-abort-algorithms">
+            add the following abort steps</a> to |signal|:
+              <ol>
+                <li>
+                  Clear the <a>pending read tuple</a> .
+                </li>
+                <li>
+                  Make a request to stop listening to <a>NDEF message</a>s
+                  on all <a>NFC adapter</a>s.
+                </li>
+              </ol>
           </li>
           <li>
-            If |reader|.<a>[[\Signal]]</a> is not `null`, then
-            <a data-cite="dom#abortsignal-abort-algorithms">add the following
-            abort steps</a> to |reader|.<a>[[\Signal]]</a>:
+            [=promise/React=] to |p|:
             <ol>
               <li>
-                Remove the {{NDEFReader}} instance from the
-                <a>activated reader objects</a>.
-              </li>
-              <li>
-                If the <a>activated reader objects</a> [= list/is empty =],
-                then make a request to stop listening to <a>NDEF message</a>s
-                on all <a>NFC adapter</a>s.
+                If |p| was settled (fulfilled or rejected), then clear the
+                <a>pending read tuple</a>.
               </li>
             </ol>
           </li>
@@ -3524,7 +3466,7 @@ <h3><dfn>Writing content</dfn></h3>
                 and abort these steps.
               </li>
               <li>
-                Add |reader| to the <a>activated reader objects</a>.
+                Set the <a>pending read tuple</a> to (|p|, |reader|).
               </li>
               <li>
                 Resolve |p|.
@@ -3549,14 +3491,10 @@ <h3><dfn>Writing content</dfn></h3>
         If the <a>NFC tag</a> in proximity range does not expose <a>NDEF</a>
         technology for reading or formatting, run the following sub-steps:
         <ol>
-          <li>[= list/For each =]
-            {{NDEFReader}} instance |reader:NDEFReader| in the
-            <a>activated reader objects</a>, run the following sub-steps:
-            <ol>
-              <li>
-                <a>Fire an event</a> named "`error`" at |reader|.
-              </li>
-            </ol>
+          <li>
+            If there is a <a>pending read tuple</a> whose |reader| is an
+            {{NDEFReader}} instance, fire an event</a> named "`readingerror`" at
+            |reader|.
           </li>
           <li>
             Abort these steps.
@@ -3623,16 +3561,11 @@ <h3><dfn>Writing content</dfn></h3>
     </p>
     <ol class=algorithm>
       <li>
-        [= list/For each =] {{NDEFReader}} instance |reader:NDEFReader| in
-        the <a>activated reader objects</a>,
-        <ol>
-          <li>
-            <a>fire an event</a> named "`reading`" at |reader| using
-            <a>NDEFReadingEvent</a> with its <a>serialNumber</a> attribute
-            initialized to |serialNumber| and <a>message</a> attribute
-            initialized to |message|.
-          </li>
-        </ol>
+        If there is a <a>pending read tuple</a> whose |reader| is an
+        {{NDEFReader}} instance, <a>fire an event</a> named "`reading`" at
+        |reader| using <a>NDEFReadingEvent</a> with its <a>serialNumber</a>
+        attribute initialized to |serialNumber| and <a>message</a> attribute
+        initialized to |message|.
       </li>
     </ol>
     </section>
diff --git a/web-nfc.d.ts b/web-nfc.d.ts
index f3b959c..0729268 100644
--- a/web-nfc.d.ts
+++ b/web-nfc.d.ts
@@ -44,26 +44,19 @@ declare interface NDEFRecordInit {
 declare type NDEFMessageSource = string | BufferSource | NDEFMessageInit
 
 interface Window {
-  NDEFWriter: NDEFWriter
+  NDEFReader: NDEFReader
 }
-declare class NDEFWriter {
+declare class NDEFReader extends EventTarget {
   constructor()
+  onreading: (this: this, event: NDEFReadingEvent) => any
+  onreadingerror: (this: this, error: Event) => any
+  scan: (options?: NDEFScanOptions) => Promise<void>
   write: (
     message: NDEFMessageSource,
     options?: NDEFWriteOptions
   ) => Promise<void>
 }
 
-interface Window {
-  NDEFReader: NDEFReader
-}
-declare class NDEFReader extends EventTarget {
-  constructor()
-  onerror: (error: any) => void
-  onreading: (event: NDEFReadingEvent) => void
-  scan: (options?: NDEFScanOptions) => Promise<void>
-}
-
 interface Window {
   NDEFReadingEvent: NDEFReadingEvent
 }
@@ -78,13 +71,9 @@ interface NDEFReadingEventInit extends EventInit {
 }
 
 interface NDEFWriteOptions {
-  ignoreRead?: boolean
   overwrite?: boolean
   signal?: AbortSignal
 }
 interface NDEFScanOptions {
-  id?: string
-  recordType?: string
-  mediaType?: string
-  signal?: AbortSignal
+  signal: AbortSignal
 }