; 123 Stat. 1403) is amended— (1) in subsection (d)(1)(A), by striking 2025 and inserting 2030 ; and (2) in subsection (e)(2), in the matter preceding subparagraph (A), by striking 2025 and inserting 2030 .