diff --git a/i2p2www/spec/proposals/111-ntcp-2.rst b/i2p2www/spec/proposals/111-ntcp-2.rst
index ead3c415..6ccf5b91 100644
--- a/i2p2www/spec/proposals/111-ntcp-2.rst
+++ b/i2p2www/spec/proposals/111-ntcp-2.rst
@@ -55,6 +55,11 @@ Design Goals
 - Add options/version in handshake for future extensibility
 - Add resistance to malicious MitM TCP segmentation if possible
 - Don't add significantly to CPU required for connection setup
+- Replace HMAC-MD5 with something more secure (see RFC 6151),
+  possibly HMAC-SHA256 or Poly1305
+- Any new crypto should be readily available in libraries for use
+  in Java (1.7), C++, and Go router implementations.
+- Include representatives of Java, C++, and Go router developers in the design
 - Minimize changes.
 - Support both versions in a common set of code.
 
@@ -69,6 +74,13 @@ Non-Goals
   (but do add flags in the handshake so we can change later)
 
 
+Related Goals
+=============
+
+- Implement a NTCP 1/2 test setup
+
+
+
 
 Router Address
 ==============
@@ -93,6 +105,17 @@ ver=7 means you support versions 1, 2, and 3.
 Messages
 ========
 
+
+
+Notes
+-----
+
+- The details that follow have not been updated to include a new DH or HMAC algorithm
+
+
+
+
+
 1) Session Request
 ------------------