; (83) thence counter-clockwise along said southern right-of-way of Columbus Circle NE to its intersection with the southern right-of-way of F Street NE; and (84) thence east along said southern right-of-way of F Street NE to the point of beginning. (c) Streets and sidewalks The Federal District shall include any street (and sidewalk thereof) that bounds the area described in subsection (b). (d) Metes and bounds survey Not later than 180 days after the date of the enactment of this Act, the President (in consultation with the Chair of the National Capital Planning Commission) shall conduct a metes and bounds survey of the Federal District, as described in subsection (b). (e) Clarification of treatment of Frances Perkins Building The entirety of the Frances Perkins Building, including any portion of the Building which is north of D Street Northwest, shall be included in the Federal District. 112. National Guard (a) Establishment Title 32, United States Code, is amended as follows: (1) Definitions In section 101— (A) in paragraphs (4) and (6), by striking Puerto Rico, and the District of Columbia both places it appears and inserting and Puerto Rico ; and (B) in paragraph (19), by striking the Commonwealth of Puerto Rico, or the District of Columbia and inserting or of the Commonwealth of Puerto Rico . (2) Branches and organizations In section 103, by striking the District of Columbia, . (3) Units: location; organization; command In subsections (c) and (d) of section 104, by striking the District of Columbia, both places it appears. (4) Availability of appropriations In section 107(b), by striking the District of Columbia, . (5) Maintenance of other troops In section 109— (A) in subsections (a), (b), and (c), by striking the District of Columbia, each place it appears; and (B) in subsection (c), by striking (or commanding general in the case of the District of Columbia) . (6) Drug interdiction and counter-drug activities In section 112(h)— (A) in paragraph (3), by striking the District of Columbia,