diff --git a/xep-0410.xml b/xep-0410.xml
index 2c875d03..f2e05a9b 100644
--- a/xep-0410.xml
+++ b/xep-0410.xml
@@ -29,6 +29,12 @@
Existing approaches for re-synchronization are either inefficient - (presence updates and "silent" messages are reflected to all participants, + (presence updates and "silent" messages are reflected to all occupants, totalling to O(N²) stanzas per time unit), or mask message / presence losses (the implicit join performed via the deprecated GC1.0 protocol).
This specification aims to provide the most efficient, albeit not the most elegant, way for clients to periodically check whether they are still - joined to a chatroom.
+ joined to a chatroom. However, it can not ensure that a client remains + joined to a room without any interruptions.This specification only makes sense in the context of &xep0045; @@ -75,8 +82,8 @@ and a typically local server-to-component link. If one of the involved servers or the MUC component is restarted, or one of the links is disturbed for some time, this can lead to the removal of some or all - participants from the affected MUCs, without the clients being informed.
-To a participant, this looks like the MUC is silent (there is no chat + occupants from the affected MUCs, without the clients being informed.
+To an occupant, this looks like the MUC is silent (there is no chat activity and no presence changes), making it hard to realize that the connection was interrupted.
To prevent the bad usability effect (message loss, lack of reaction from @@ -87,13 +94,13 @@ it is still joined to a MUC:
If Juliet's client is not joined, the MUC service will respond with a <not-acceptable> error. Thus, her client can automatically attempt a rejoin.
-Therefore, a MUC service supporting this protocol may directly respond - to a participant's Ping request to the participant's own nickname, as - opposed to routing it to any of the participant's clients.
+ to a occupant's Ping request to the occupant's own nickname, as + opposed to routing it to any of the occupant's clients. A service + implementing this optimization needs to advertise the + self-ping-optimization feature in the &xep0030; response on + the individual MUC room JIDs, and it MUST respond to a self-ping request + as follows: +In Multi-Session-Nick scenarios, where multiple clients of the same user - are joined as the same participant, it is possible that another client + are joined as the same occupant, it is possible that another client initiates a nickname change while a ping request is pending. In that case, the ping might be responded to with <item-not-found>.
A client should not perform a self-ping after initiating a nickname change, and before receiving the response to the nickname change from the service, as it is not yet clear whether the new nickname will be accepted.
+If a client session is in hibernation (&xep0198;), the client should defer + sending of self-ping requests until it is reconnected and re-authenticated. +
A MUC service implementation should not allow a non-participant to obtain - information about participants. This is however true irregardless of +
A MUC service implementation should not allow a non-occupant to obtain + information about occupants. This is however true irregardless of implementing this specification.
REQUIRED.
+This document requires no interaction with &IANA;.
REQUIRED.
+Include "http://jabber.org/protocol/muc#self-ping-optimization" + as a valid feature in the Registry of Features.
+
+ http://jabber.org/protocol/muc#self-ping-optimization
+ Support for the MUC self-ping optimization
+ XEP-0410
+
+]]>
+
REQUIRED for protocol specifications.
+This document does not define any new XML structure requiring a schema.