Changes from resubmission to JID.

Revision 3