diff --git a/i2p2www/spec/proposals/111-ntcp-2.rst b/i2p2www/spec/proposals/111-ntcp-2.rst
index b647ed5f25fc811623d337f06ffc55d79fc5e0a2..99becfbbf3026cafd3961d3080fa4322c8ec7a5a 100644
--- a/i2p2www/spec/proposals/111-ntcp-2.rst
+++ b/i2p2www/spec/proposals/111-ntcp-2.rst
@@ -6,7 +6,7 @@ NTCP 2
     :editor: manas, str4d
     :created: 2014-02-13
     :thread: http://zzz.i2p/topics/1577
-    :lastupdated: 2018-04-12
+    :lastupdated: 2018-04-16
     :status: Open
     :supercedes: 106
 
@@ -421,11 +421,11 @@ Alice                           Bob
 {% endhighlight %}
 
 Using Noise terminology, the establishment and data sequence is as follows:
+(Payload Security Properties)
 
 .. raw:: html
 
   {% highlight lang='text' %}
-Payload Security Properties
 XK(s, rs):           Authentication   Confidentiality
     <- s
     ...
@@ -665,11 +665,11 @@ Noise content: Alice's ephemeral key X
 Noise payload: 16 byte option block
 Non-noise payload: Random padding
 
+(Payload Security Properties)
 
 .. raw:: html
 
   {% highlight lang='text' %}
-Payload Security Properties
 XK(s, rs):           Authentication   Confidentiality
     -> e, es                  0                2
 
@@ -974,11 +974,11 @@ Noise content: Bob's ephemeral key Y
 Noise payload: 8 byte option block
 Non-noise payload: Random padding
 
+(Payload Security Properties)
 
 .. raw:: html
 
   {% highlight lang='text' %}
-Payload Security Properties
 XK(s, rs):           Authentication   Confidentiality
     <- e, ee                  2                1
 
@@ -1244,11 +1244,12 @@ Noise content: Alice's static key
 Noise payload: Alice's RouterInfo and random padding
 Non-noise payload: none
 
+(Payload Security Properties)
+
 
 .. raw:: html
 
   {% highlight lang='text' %}
-Payload Security Properties
 XK(s, rs):           Authentication   Confidentiality
     -> s, se                  2                5
 
@@ -1473,12 +1474,12 @@ Types include date/time, I2NP message, options, termination, and padding.
 Note: Bob may, but is not required, to send his RouterInfo to Alice as
 his first message to Alice in the data phase.
 
+(Payload Security Properties)
 
 
 .. raw:: html
 
   {% highlight lang='text' %}
-Payload Security Properties
 XK(s, rs):           Authentication   Confidentiality
     <-                        2                5
     ->                        2                5