1 files changed, 17 insertions, 7 deletions

diff --git a/18.md b/18.md
index 422ad9c..27c5915 100644
--- a/18.md
+++ b/18.md
@@ -4,13 +4,12 @@ NIP-18
 Reposts
 -------
 
-`draft` `optional` `author:jb55` `author:fiatjaf` `author:arthurfranca`
+`draft` `optional`
 
-A repost is a `kind 6` note that is used to signal to followers
-that another event is worth reading.
+A repost is a `kind 6` event that is used to signal to followers
+that a `kind 1` text note is worth reading.
 
-The `content` of a repost event is empty. Optionally, it MAY contain
-the stringified JSON of the reposted note event for quick look up.
+The `content` of a repost event is _the stringified JSON of the reposted note_. It MAY also be empty, but that is not recommended.
 
 The repost event MUST include an `e` tag with the `id` of the note that is
 being reposted. That tag MUST include a relay URL as its third entry
@@ -21,5 +20,16 @@ reposted.
 
 ## Quote Reposts
 
-Quote reposts are `kind 1` events with an embedded `e` tag (see [NIP-08](08.md) and [NIP-27](27.md)).
-Because a quote repost includes an `e` tag, it may show up along replies to the reposted note.
+Quote reposts are `kind 1` events with an embedded `q` tag of the note being
+quote reposted. The `q` tag ensures quote reposts are not pulled and included
+as replies in threads. It also allows you to easily pull and count all of the
+quotes for a post.
+
+## Generic Reposts
+
+Since `kind 6` reposts are reserved for `kind 1` contents, we use `kind 16`
+as a "generic repost", that can include any kind of event inside other than
+`kind 1`.
+
+`kind 16` reposts SHOULD contain a `k` tag with the stringified kind number
+of the reposted event as its value.