; and (II) by striking thereafter ; and (ii) in paragraph (2), by striking subsection (d) each place it appears and inserting paragraph (1) of this subsection ; (D) in subsection (e)(1), by striking Fees payable to Under Secretary in the heading and inserting Fees payable to Administrator ; and (E) in subsection (i)(4)— (i) by striking subparagraphs (A) through (D); and (ii) by redesignating subparagraphs (E) through (L) as subparagraphs (A) through (H), respectively; (32) section 44941(a) is amended by inserting the Department of Homeland Security, after Department of Transportation, ; (33) section 44942 is amended— (A) in subsection (a)— (i) in paragraph (1)— (I) in the matter preceding subparagraph (A), by striking Within 180 days after the date of enactment of the Aviation and Transportation Security Act, the Under Secretary for Transportation Security may, in consultation with and inserting The Administrator of the Transportation Security Administration may, in consultation with other relevant Federal agencies and ; and (II) in subparagraph (A), by striking , and and inserting ; and ; and (ii) in paragraph (2), by inserting a comma after Federal Aviation Administration ; (B) in subsection (b)— (i) by striking (1) Performance plan and report .— ; (ii) by redesignating subparagraphs (A) and (B) as paragraphs (1) and (2), respectively; (iii) in paragraph (1), as redesignated— (I) by redesignating clauses (i) and (ii) as subparagraphs (A) and (B), respectively; (II) in subparagraph (A), as redesignated, by striking the Secretary and the Under Secretary for Transportation Security shall agree and inserting the Secretary of Homeland Security and the Administrator of the Transportation Security Administration shall agree ; and (III) in subparagraph (B), as redesignated, by striking the Secretary, the Under Secretary for Transportation Security and inserting the Secretary of Homeland Security, the Administrator of the Transportation Security Administration,