; and (B) by striking the period at the end and inserting: (B) any substance not covered under subparagraph (A) that was a substance under such section as of December 1, 2018, and whose use the Secretary of Transportation decides has a risk to transportation safety. . (7) Electronic cannabis delivery system Section 375(7)(C) of title 15, United States Code, is amended by adding at the end the following: (16) Electronic cannabis delivery system (A) In general Electronic cannabis delivery systems are devices that are intended for the exclusive use with cannabis. (B) Definition The term electronic cannabis delivery system means an electronic device that delivers a designated State medical cannabis products within the meaning of the Federal Food Drug and Cosmetic Act or a cannabis product within the meaning of title III of the Federal Alcohol Administration Act, via an aerosolized or vaporized solution to the user inhaling from the device, and any component, liquid, part, or accessory of such a device, whether or not sold separately. (C) Labeling Electronic cannabis delivery systems shall be labeled NOT FOR USE WITH TOBACCO OR NICOTINE. . (D) Sale of delivery systems The sale of electronic cannabis delivery systems, via in-person or e-commerce platforms, shall be subject to age-gate measures to ensure the sale of these devices are to appropriate age populations. (E) Non-tobacco Electronic cannabis delivery systems are independent to that of electronic delivery systems used with tobacco and tobacco-related substances referred to as electronic nicotine delivery systems (ENDS). (F) Like alcohol or like medical devices A cannabis product within the meaning of title III of the Federal Alcohol Administration Act shall be treated like an alcoholic beverage for the purposes of mailability and age-gate measures mentioned in section (D). A designated State medical cannabis product within the meaning of the Federal Food Drug and Cosmetic Act, shall be treated like similar FDA-regulated therapeutics, therapeutic devices, or