diff --git a/figures/draft-poidt-ccamp-actn-wdm-pluggable-modelling.html b/figures/draft-poidt-ccamp-actn-wdm-pluggable-modelling.html
index dd67603..90f86d6 100644
--- a/figures/draft-poidt-ccamp-actn-wdm-pluggable-modelling.html
+++ b/figures/draft-poidt-ccamp-actn-wdm-pluggable-modelling.html
@@ -1171,33 +1171,30 @@ <h2 id="name-copyright-notice">
             <p id="section-toc.1-1.6.1"><a href="#section-6" class="auto internal xref">6</a>.  <a href="#name-optical-pluggables-yang-mod" class="internal xref">Optical Pluggables Yang Model</a></p>
 </li>
           <li class="compact toc ulBare ulEmpty" id="section-toc.1-1.7">
-            <p id="section-toc.1-1.7.1"><a href="#section-7" class="auto internal xref">7</a>.  <a href="#name-conventions-and-definitions" class="internal xref">Conventions and Definitions</a></p>
+            <p id="section-toc.1-1.7.1"><a href="#section-7" class="auto internal xref">7</a>.  <a href="#name-security-considerations" class="internal xref">Security Considerations</a></p>
 </li>
           <li class="compact toc ulBare ulEmpty" id="section-toc.1-1.8">
-            <p id="section-toc.1-1.8.1"><a href="#section-8" class="auto internal xref">8</a>.  <a href="#name-security-considerations" class="internal xref">Security Considerations</a></p>
+            <p id="section-toc.1-1.8.1"><a href="#section-8" class="auto internal xref">8</a>.  <a href="#name-iana-considerations" class="internal xref">IANA Considerations</a></p>
 </li>
           <li class="compact toc ulBare ulEmpty" id="section-toc.1-1.9">
-            <p id="section-toc.1-1.9.1"><a href="#section-9" class="auto internal xref">9</a>.  <a href="#name-iana-considerations" class="internal xref">IANA Considerations</a></p>
-</li>
-          <li class="compact toc ulBare ulEmpty" id="section-toc.1-1.10">
-            <p id="section-toc.1-1.10.1"><a href="#section-10" class="auto internal xref">10</a>. <a href="#name-references" class="internal xref">References</a></p>
+            <p id="section-toc.1-1.9.1"><a href="#section-9" class="auto internal xref">9</a>.  <a href="#name-references" class="internal xref">References</a></p>
 <ul class="compact toc ulBare ulEmpty">
-<li class="compact toc ulBare ulEmpty" id="section-toc.1-1.10.2.1">
-                <p id="section-toc.1-1.10.2.1.1"><a href="#section-10.1" class="auto internal xref">10.1</a>.  <a href="#name-normative-references" class="internal xref">Normative References</a></p>
+<li class="compact toc ulBare ulEmpty" id="section-toc.1-1.9.2.1">
+                <p id="section-toc.1-1.9.2.1.1"><a href="#section-9.1" class="auto internal xref">9.1</a>.  <a href="#name-normative-references" class="internal xref">Normative References</a></p>
 </li>
-              <li class="compact toc ulBare ulEmpty" id="section-toc.1-1.10.2.2">
-                <p id="section-toc.1-1.10.2.2.1"><a href="#section-10.2" class="auto internal xref">10.2</a>.  <a href="#name-informative-references" class="internal xref">Informative References</a></p>
+              <li class="compact toc ulBare ulEmpty" id="section-toc.1-1.9.2.2">
+                <p id="section-toc.1-1.9.2.2.1"><a href="#section-9.2" class="auto internal xref">9.2</a>.  <a href="#name-informative-references" class="internal xref">Informative References</a></p>
 </li>
             </ul>
+</li>
+          <li class="compact toc ulBare ulEmpty" id="section-toc.1-1.10">
+            <p id="section-toc.1-1.10.1"><a href="#appendix-A" class="auto internal xref"></a><a href="#name-acknowledgments" class="internal xref">Acknowledgments</a></p>
 </li>
           <li class="compact toc ulBare ulEmpty" id="section-toc.1-1.11">
-            <p id="section-toc.1-1.11.1"><a href="#appendix-A" class="auto internal xref"></a><a href="#name-acknowledgments" class="internal xref">Acknowledgments</a></p>
+            <p id="section-toc.1-1.11.1"><a href="#appendix-B" class="auto internal xref"></a><a href="#name-contributors" class="internal xref">Contributors</a></p>
 </li>
           <li class="compact toc ulBare ulEmpty" id="section-toc.1-1.12">
-            <p id="section-toc.1-1.12.1"><a href="#appendix-B" class="auto internal xref"></a><a href="#name-contributors" class="internal xref">Contributors</a></p>
-</li>
-          <li class="compact toc ulBare ulEmpty" id="section-toc.1-1.13">
-            <p id="section-toc.1-1.13.1"><a href="#appendix-C" class="auto internal xref"></a><a href="#name-authors-addresses" class="internal xref">Authors' Addresses</a></p>
+            <p id="section-toc.1-1.12.1"><a href="#appendix-C" class="auto internal xref"></a><a href="#name-authors-addresses" class="internal xref">Authors' Addresses</a></p>
 </li>
         </ul>
 </nav>
@@ -1208,9 +1205,10 @@ <h2 id="name-copyright-notice">
       <h2 id="name-terminology">
 <a href="#section-1" class="section-number selfRef">1. </a><a href="#name-terminology" class="section-name selfRef">Terminology</a>
       </h2>
-<p id="section-1-1">The key words "<span class="bcp14">MUST</span>", "<span class="bcp14">MUST NOT</span>", "<span class="bcp14">REQUIRED</span>", "<span class="bcp14">SHALL</span>", "<span class="bcp14">SHALL NOT</span>"
-"<span class="bcp14">SHOULD</span>", "<span class="bcp14">SHOULD NOT</span>", "<span class="bcp14">RECOMMENDED</span>", "<span class="bcp14">MAY</span>", and "<span class="bcp14">OPTIONAL</span>" in the
-document are to be interpreted as described in <span>[<a href="#RFC2119" class="cite xref">RFC2119</a>]</span>.<a href="#section-1-1" class="pilcrow">¶</a></p>
+<p id="section-1-1">The key words "<span class="bcp14">MUST</span>", "<span class="bcp14">MUST NOT</span>", "<span class="bcp14">REQUIRED</span>", "<span class="bcp14">SHALL</span>", "<span class="bcp14">SHALL NOT</span>", "<span class="bcp14">SHOULD</span>", "<span class="bcp14">SHOULD NOT</span>", "<span class="bcp14">RECOMMENDED</span>", "<span class="bcp14">NOT RECOMMENDED</span>",
+"<span class="bcp14">MAY</span>", and "<span class="bcp14">OPTIONAL</span>" in this document are to be interpreted as
+described in BCP 14 <span>[<a href="#RFC2119" class="cite xref">RFC2119</a>]</span> <span>[<a href="#RFC8174" class="cite xref">RFC8174</a>]</span> when, and only when, they
+appear in all capitals, as shown here.<a href="#section-1-1" class="pilcrow">¶</a></p>
 <p id="section-1-2">The following terms abbreviations are used in this document:<a href="#section-1-2" class="pilcrow">¶</a></p>
 <ul class="normal">
 <li class="normal" id="section-1-3.1">
@@ -1258,21 +1256,21 @@ <h2 id="name-introduction">
 <p id="section-2-10">The document is divided into the following sections:<a href="#section-2-10" class="pilcrow">¶</a></p>
 <ul class="normal">
 <li class="normal" id="section-2-11.1">
-          <p id="section-2-11.1.1">Section 3: Packet over optical converged network context<a href="#section-2-11.1.1" class="pilcrow">¶</a></p>
+          <p id="section-2-11.1.1"><a href="#network-context" class="auto internal xref">Section 3</a>: Packet over optical converged network context<a href="#section-2-11.1.1" class="pilcrow">¶</a></p>
 </li>
         <li class="normal" id="section-2-11.2">
-          <p id="section-2-11.2.1">Section 4: Coherent Pluggables Building Blocks<a href="#section-2-11.2.1" class="pilcrow">¶</a></p>
+          <p id="section-2-11.2.1"><a href="#building-blocks" class="auto internal xref">Section 4</a>: Coherent Pluggables Building Blocks<a href="#section-2-11.2.1" class="pilcrow">¶</a></p>
 </li>
         <li class="normal" id="section-2-11.3">
-          <p id="section-2-11.3.1">Section 5: Coherent Pluggables Data Modeling<a href="#section-2-11.3.1" class="pilcrow">¶</a></p>
+          <p id="section-2-11.3.1"><a href="#data-model" class="auto internal xref">Section 5</a>: Coherent Pluggables Data Modeling<a href="#section-2-11.3.1" class="pilcrow">¶</a></p>
 </li>
         <li class="normal" id="section-2-11.4">
-          <p id="section-2-11.4.1">Section 6: Coherent Pluggables Yang Model<a href="#section-2-11.4.1" class="pilcrow">¶</a></p>
+          <p id="section-2-11.4.1"><a href="#yang-model" class="auto internal xref">Section 6</a>: Coherent Pluggables Yang Model<a href="#section-2-11.4.1" class="pilcrow">¶</a></p>
 </li>
       </ul>
 </section>
 </div>
-<div id="packet-over-optical-converged-network-context">
+<div id="network-context">
 <section id="section-3">
       <h2 id="name-packet-over-optical-converg">
 <a href="#section-3" class="section-number selfRef">3. </a><a href="#name-packet-over-optical-converg" class="section-name selfRef">Packet over optical converged network context</a>
@@ -1327,7 +1325,7 @@ <h2 id="name-packet-over-optical-converg">
 </div>
 </section>
 </div>
-<div id="optical-pluggable-building-blocks">
+<div id="building-blocks">
 <section id="section-4">
       <h2 id="name-optical-pluggable-building-">
 <a href="#section-4" class="section-number selfRef">4. </a><a href="#name-optical-pluggable-building-" class="section-name selfRef">Optical Pluggable Building Blocks</a>
@@ -1355,7 +1353,6 @@ <h2 id="name-optical-pluggable-building-">
      | |----------------------------------------------------------------------| |
      |                                                                          |
      |--------------------------------------------------------------------------|
-
 </pre>
 </div>
 <figcaption><a href="#figure-2" class="selfRef">Figure 2</a>:
@@ -1364,55 +1361,44 @@ <h2 id="name-optical-pluggable-building-">
 </div>
 </section>
 </div>
-<div id="optical-pluggables-data-modeling">
+<div id="data-model">
 <section id="section-5">
       <h2 id="name-optical-pluggables-data-mod">
 <a href="#section-5" class="section-number selfRef">5. </a><a href="#name-optical-pluggables-data-mod" class="section-name selfRef">Optical Pluggables Data Modeling</a>
     </h2>
 </section>
 </div>
-<div id="optical-pluggables-yang-model">
+<div id="yang-model">
 <section id="section-6">
       <h2 id="name-optical-pluggables-yang-mod">
 <a href="#section-6" class="section-number selfRef">6. </a><a href="#name-optical-pluggables-yang-mod" class="section-name selfRef">Optical Pluggables Yang Model</a>
     </h2>
 </section>
 </div>
-<div id="conventions-and-definitions">
-<section id="section-7">
-      <h2 id="name-conventions-and-definitions">
-<a href="#section-7" class="section-number selfRef">7. </a><a href="#name-conventions-and-definitions" class="section-name selfRef">Conventions and Definitions</a>
-      </h2>
-<p id="section-7-1">The key words "<span class="bcp14">MUST</span>", "<span class="bcp14">MUST NOT</span>", "<span class="bcp14">REQUIRED</span>", "<span class="bcp14">SHALL</span>", "<span class="bcp14">SHALL NOT</span>", "<span class="bcp14">SHOULD</span>", "<span class="bcp14">SHOULD NOT</span>", "<span class="bcp14">RECOMMENDED</span>", "<span class="bcp14">NOT RECOMMENDED</span>",
-"<span class="bcp14">MAY</span>", and "<span class="bcp14">OPTIONAL</span>" in this document are to be interpreted as
-described in BCP 14 <span>[<a href="#RFC2119" class="cite xref">RFC2119</a>]</span> <span>[<a href="#RFC8174" class="cite xref">RFC8174</a>]</span> when, and only when, they
-appear in all capitals, as shown here.<a href="#section-7-1" class="pilcrow">¶</a></p>
-</section>
-</div>
 <div id="security-considerations">
-<section id="section-8">
+<section id="section-7">
       <h2 id="name-security-considerations">
-<a href="#section-8" class="section-number selfRef">8. </a><a href="#name-security-considerations" class="section-name selfRef">Security Considerations</a>
+<a href="#section-7" class="section-number selfRef">7. </a><a href="#name-security-considerations" class="section-name selfRef">Security Considerations</a>
       </h2>
-<p id="section-8-1">TODO Security<a href="#section-8-1" class="pilcrow">¶</a></p>
+<p id="section-7-1">TODO Security<a href="#section-7-1" class="pilcrow">¶</a></p>
 </section>
 </div>
 <div id="iana-considerations">
-<section id="section-9">
+<section id="section-8">
       <h2 id="name-iana-considerations">
-<a href="#section-9" class="section-number selfRef">9. </a><a href="#name-iana-considerations" class="section-name selfRef">IANA Considerations</a>
+<a href="#section-8" class="section-number selfRef">8. </a><a href="#name-iana-considerations" class="section-name selfRef">IANA Considerations</a>
       </h2>
-<p id="section-9-1">This document has no IANA actions.<a href="#section-9-1" class="pilcrow">¶</a></p>
+<p id="section-8-1">This document has no IANA actions.<a href="#section-8-1" class="pilcrow">¶</a></p>
 </section>
 </div>
-<section id="section-10">
+<section id="section-9">
       <h2 id="name-references">
-<a href="#section-10" class="section-number selfRef">10. </a><a href="#name-references" class="section-name selfRef">References</a>
+<a href="#section-9" class="section-number selfRef">9. </a><a href="#name-references" class="section-name selfRef">References</a>
       </h2>
 <div id="sec-normative-references">
-<section id="section-10.1">
+<section id="section-9.1">
         <h3 id="name-normative-references">
-<a href="#section-10.1" class="section-number selfRef">10.1. </a><a href="#name-normative-references" class="section-name selfRef">Normative References</a>
+<a href="#section-9.1" class="section-number selfRef">9.1. </a><a href="#name-normative-references" class="section-name selfRef">Normative References</a>
         </h3>
 <dl class="references">
 <dt id="OIF-CMIS">[OIF-CMIS]</dt>
@@ -1431,9 +1417,9 @@ <h3 id="name-normative-references">
 </section>
 </div>
 <div id="sec-informative-references">
-<section id="section-10.2">
+<section id="section-9.2">
         <h3 id="name-informative-references">
-<a href="#section-10.2" class="section-number selfRef">10.2. </a><a href="#name-informative-references" class="section-name selfRef">Informative References</a>
+<a href="#section-9.2" class="section-number selfRef">9.2. </a><a href="#name-informative-references" class="section-name selfRef">Informative References</a>
         </h3>
 <dl class="references">
 <dt id="RFC8453">[RFC8453]</dt>
diff --git a/figures/draft-poidt-ccamp-actn-wdm-pluggable-modelling.txt b/figures/draft-poidt-ccamp-actn-wdm-pluggable-modelling.txt
index 6deccbf..9478678 100644
--- a/figures/draft-poidt-ccamp-actn-wdm-pluggable-modelling.txt
+++ b/figures/draft-poidt-ccamp-actn-wdm-pluggable-modelling.txt
@@ -95,21 +95,22 @@ Table of Contents
    4.  Optical Pluggable Building Blocks
    5.  Optical Pluggables Data Modeling
    6.  Optical Pluggables Yang Model
-   7.  Conventions and Definitions
-   8.  Security Considerations
-   9.  IANA Considerations
-   10. References
-     10.1.  Normative References
-     10.2.  Informative References
+   7.  Security Considerations
+   8.  IANA Considerations
+   9.  References
+     9.1.  Normative References
+     9.2.  Informative References
    Acknowledgments
    Contributors
    Authors' Addresses
 
 1.  Terminology
 
-   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT"
-   "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in the
-   document are to be interpreted as described in [RFC2119].
+   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
+   "SHOULD", "SHOULD NOT", "RECOMMENDED", "NOT RECOMMENDED", "MAY", and
+   "OPTIONAL" in this document are to be interpreted as described in
+   BCP 14 [RFC2119] [RFC8174] when, and only when, they appear in all
+   capitals, as shown here.
 
    The following terms abbreviations are used in this document:
 
@@ -279,25 +280,17 @@ Table of Contents
 
 6.  Optical Pluggables Yang Model
 
-7.  Conventions and Definitions
-
-   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
-   "SHOULD", "SHOULD NOT", "RECOMMENDED", "NOT RECOMMENDED", "MAY", and
-   "OPTIONAL" in this document are to be interpreted as described in
-   BCP 14 [RFC2119] [RFC8174] when, and only when, they appear in all
-   capitals, as shown here.
-
-8.  Security Considerations
+7.  Security Considerations
 
    TODO Security
 
-9.  IANA Considerations
+8.  IANA Considerations
 
    This document has no IANA actions.
 
-10.  References
+9.  References
 
-10.1.  Normative References
+9.1.  Normative References
 
    [OIF-CMIS] OIF Forum, "OIF Implementation Agreement (IA) Common
               Management Interface Specification (CMIS))", OIF CMIS IA ,
@@ -313,7 +306,7 @@ Table of Contents
               2119 Key Words", BCP 14, RFC 8174, DOI 10.17487/RFC8174,
               May 2017, <https://www.rfc-editor.org/rfc/rfc8174>.
 
-10.2.  Informative References
+9.2.  Informative References
 
    [RFC8453]  Ceccarelli, D., Ed. and Y. Lee, Ed., "Framework for
               Abstraction and Control of TE Networks (ACTN)", RFC 8453,
diff --git a/index.html b/index.html
index af0f9dc..4c072f2 100644
--- a/index.html
+++ b/index.html
@@ -29,7 +29,7 @@ <h2>Preview for branch <a href="figures">figures</a></h2>
       <tr>
         <td><a href="figures/draft-poidt-ccamp-actn-wdm-pluggable-modelling.html" class="html draft-poidt-ccamp-actn-wdm-pluggable-modelling" title="Modelling of Optical Pluggables in Packet Over Optical Network (HTML)">Modelling Optical Pluggables</a></td>
         <td><a href="figures/draft-poidt-ccamp-actn-wdm-pluggable-modelling.txt" class="txt draft-poidt-ccamp-actn-wdm-pluggable-modelling" title="Modelling of Optical Pluggables in Packet Over Optical Network (Text)">plain text</a></td>
-        <td><a href="https://author-tools.ietf.org/api/iddiff?url_1=https://italobusi.github.io/actn-wdm-pluggable-modelling/draft-poidt-ccamp-actn-wdm-pluggable-modelling.txt&amp;url_2=https://italobusi.github.io/actn-wdm-pluggable-modelling/figures/draft-poidt-ccamp-actn-wdm-pluggable-modelling.txt" class="diff draft-poidt-ccamp-actn-wdm-pluggable-modelling">diff with main</a></td>
+        <td>same as main</td>
       </tr>
     </table>
     <script>