; and (2) in paragraph (2), by inserting , except to the extent that the laws apply on property used by a common or contract carrier to transport people or property by land, rail, or water or on property open to the public (whether or not a fee is charged to enter the property) before the period. (c) Each of sections 926B(e)(2) and 926C(e)(1)(B) of such title is amended by inserting any magazine and after includes . (d) Section 926C(c)(4) of such title is amended to read as follows: (4) has met the standards for qualification in firearms training during the most recent period of 12 months (or, at the option of the State in which the individual resides, a greater number of months, not exceeding 36 months), and for purposes of this paragraph, the term standards for qualification in firearms training means— (A) the standards for active duty law enforcement officers as established by the former agency of the individual; (B) the standards for active duty law enforcement officers as established by the State in which the individual resides; (C) the standards for active duty law enforcement officers employed by any law enforcement agency in the State in which the individual resides; or (D) any standard for active duty law enforcement officers for firearms qualification conducted by any certified firearms instructor within the State in which the individual resides; . (e) Section 926C(d) of such title is amended— (1) in paragraph (1), by striking not less recently than one year before the date the individual is carrying the concealed firearm, been tested or otherwise found by the agency to meet the active duty standards for qualification in firearms training as established by the agency to carry and inserting met the standards for qualification in firearms training required by subsection (c)(4) for