; and (2) in paragraph (5)(A), by inserting or more after 10 percent . (b) Existing waivers Section 211(f)(4) of the Clean Air Act ( 42 U.S.C. 7545(f)(4) ) is amended— (1) by striking The Administrator, upon and inserting (A) The Administrator, upon ; and (2) by adding at the end the following: (B) A fuel or fuel additive with respect to which a waiver has been granted in accordance with subparagraph (A) prior to January 1, 2017, and that meets all of the conditions of that waiver, other than the waiver’s limits for Reid vapor pressure, may be introduced into commerce if the fuel or fuel additive meets all other applicable Reid vapor pressure requirements. . 212. E20 Section 211(f)(4) of the Clean Air Act ( 42 U.S.C. 7545(f)(4) ), as amended by section 211(b) of this Act, is further amended by adding at the end the following: (C) The Administrator shall grant a waiver in accordance with subparagraph (A) with respect to a fuel with a concentration of ethanol that is— (i) not more than 20 percent; and (ii) more than 15 percent. . C Fueling infrastructure 221. Performance standards for new E20 infrastructure Section 9003 of the Solid Waste Disposal Act ( 42 U.S.C. 6991b ) is amended by adding at the end the following: (k) E20 retail dispenser systems (1) In general The Administrator shall, not later than 1 year prior to the effective date specified in paragraph (3), issue or revise, as necessary, performance standards for dispenser systems described in paragraph (2) to require that such dispenser systems be compatible with automotive fuel with a concentration of up to and including 20 percent ethanol by volume. (2) Dispenser systems This subsection applies with respect to dispenser systems that are— (A) on or after the effective date specified in paragraph (3), brought into use to dispense at retail automotive fuel from an underground storage tank