; (ii) by striking this subsection and inserting this section ; and (iii) by striking construction of fences and inserting the construction of physical barriers, tactical infrastructure, and technology ; (D) by amending paragraph (3) to read as follows: (3) Agent safety In carrying out this section, the Secretary of Homeland Security, when designing, testing, constructing, installing, deploying, integrating, and operating physical barriers, tactical infrastructure, or technology, shall incorporate such safety features into such design, test, construction, installation, deployment, integration, or operation of such physical barriers, tactical infrastructure, or technology, as the case may be, that the Secretary determines are necessary to maximize the safety and effectiveness of officers and 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)— (A) by amending paragraph (1) to read as follows: (1) In general Notwithstanding any other provision of law, the Secretary of Homeland Security shall waive all legal requirements necessary to ensure the expeditious design, testing, construction, installation, deployment, integration, operation, and maintenance of the physical barriers, tactical infrastructure, and technology under this section. The Secretary shall ensure the maintenance and effectiveness of such physical barriers, tactical infrastructure, or technology. Any such action by the Secretary shall be effective upon publication in the Federal Register. ; (B) by redesignating paragraph (2) as paragraph (3)