Refactored Your Partner XML and corrected errors