Changes for final resubmission.

Added final things before resubmission to JID.