; (ii) in paragraph (2), by striking to subsection (i)(3) and inserting to subsection (j)(3) ; and (iii) in paragraph (3)— (I) in subparagraph (A), by striking with subsection (g) and inserting with subsection (h) ; and (II) in subparagraph (B)— (aa) by striking to subsection (i)(1)(C) and inserting to subsection (j)(1)(C) ; and (bb) by striking under subsection (i) and inserting under subsection (j) ; (C) in subsection (d)(2), by striking to subsection (i) and inserting to subsection (j) ; (D) in subsection (e)(2), by striking to subsection (i) and inserting to subsection (j) ; (E) in subsection (h), as redesignated by subsection (a)(1)— (i) in paragraph (2)(A)(iii), by striking with subsection (f) and inserting with subsection (g) ; (ii) in paragraph (3), by striking with subsection (i)(1)(C) and inserting with subsection (j)(1)(C) ; and (iii) in paragraph (6), by striking to subsection (i) and inserting to subsection (j) ; (F) in subsection (j), as redesignated by subsection (a)(1)— (i) in paragraph (1)— (I) in subparagraph (A), by striking targeting and minimization procedures adopted in accordance with subsections (d) and (e) and inserting targeting, minimization, and querying procedures adopted in accordance with subsections (d), (e), and (f)(1) ; (II) in subparagraph (B), by striking targeting and minimization procedures adopted in accordance with subsections (d) and (e) and inserting targeting, minimization, and querying procedures adopted in accordance with subsections (d), (e), and (f)(1) ; and (III) in subparagraph (C), by striking targeting and minimization procedures adopted in accordance with subsections (d) and (e) and inserting targeting, minimization, and querying procedures adopted in accordance with subsections (d), (e), and (f)(1) ; (ii) in paragraph (2)— (I) in subparagraph (A), by striking with subsection (g) and inserting with subsection (h)