; and (B) in paragraph (2), by striking 2023 and inserting 2028 ; (8) in subsection (h)(1), by striking subsections (a) through (e), and (g) and inserting subsections (a) through (e), (g), and (k) ; (9) in subsection (i)(1), by striking subsections (a) through (e) and subsection (g) and inserting subsections (a) through (e), (g), and (k) ; and (10) in subsection (j)(1), by striking subsections (a) through (e) and (g) and inserting subsections (a) through (e), (g), and (k) .