; 128 Stat. 1257; 130 Stat. 1902) is amended— (1) in subsection (b)— (A) in paragraph (1)(B), by striking 20,000 and inserting 42,000 ; (B) in paragraph (2), by striking subparagraph (A) and inserting the following: (A) an aggregate aboveground storage capacity greater than 10,000 gallons but less than 42,000 gallons; and ; (C) in paragraph (3)— (i) by striking subparagraph (A) and inserting the following: (A) with an aggregate aboveground storage capacity of less than or equal to 10,000 gallons; and ; and (ii) in subparagraph (B), by striking ; and and inserting a period; and (D) by striking paragraph (4); (2) in subsection (c)(2)(A)— (A) in clause (i), by striking 1,000 and inserting 1,320 ; and (B) in clause (ii), by striking 2,500 and inserting 3,000 ; and (3) by striking subsection (d).