; (ii) by striking this subsection and inserting this section ; and (iii) by striking construction of fences and inserting the construction of physical barriers ; (D) by amending paragraph (3) to read as follows: (3) Agent safety In carrying out this section, the Secretary of Homeland Security, when designing, constructing, and deploying physical barriers, tactical infrastructure, or technology, shall incorporate such safety features into such design, construction, or deployment of such physical barriers, tactical infrastructure, or technology, as the case may be, that the Secretary determines, in the Secretary’s sole discretion, are necessary to maximize the safety and effectiveness of officers or agents of the Department of Homeland Security or of any other Federal agency deployed in the vicinity of such physical barriers, tactical infrastructure, or technology. ; and (E) in paragraph (4), by striking this subsection and inserting this section ; (3) in subsection (c), by amending paragraph (1) to read as follows: (1) In general Notwithstanding any other provision of law, the Secretary of Homeland Security shall have the authority to waive all legal requirements the Secretary, in the Secretary’s sole discretion, determines necessary to ensure the expeditious design, testing, construction, installation, deployment, integration, and operation of the physical barriers, tactical infrastructure, and technology under this section. Such waiver authority shall also apply with respect to any maintenance carried out on such physical barriers, tactical infrastructure, or technology. Any such decision by the Secretary shall be effective upon publication in the Federal Register.