; (iii) in subparagraph (C)— (I) in clause (i)— (aa) by striking the Secretary of the Interior, the Secretary of Agriculture, States, local governments, Indian tribes, and and inserting appropriate Federal agency partners, appropriate representatives of Federal, State, Tribal, and local governments, and appropriate private ; and (bb) by striking fencing is and inserting physical barriers are ; and (II) in clause (ii)— (aa) in subclause (I), by striking or after the semicolon at the end; (bb) by amending subclause (II) to read as follows: (II) delay the transfer to the United States of the possession of property or affect the validity of any property acquisition by the United States by purchase or eminent domain, or to otherwise affect the eminent domain laws of the United States or of any State; or ; and (cc) by adding at the end the following: (III) create any right or liability for any party. ; and (iv) by striking subparagraph (D); (C) in paragraph (2)— (i) by striking Attorney General and inserting Secretary of Homeland Security ; and (ii) by striking this subsection and shall commence construction of fences and inserting this section and shall commence 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 consultation with the labor organization representing agents of U.S. Border Patrol, 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.