; ; (3) in subparagraph (B)— (A) by inserting an offense relating to before illicit trafficking ; and (B) by inserting before the semicolon at the end the following: and any offense under State law relating to a controlled substance (as so classified under State law) which is classified as a felony in that State, regardless of whether the substance is classified as a controlled substance under section 102 of the Controlled Substances Act ( 8 U.S.C. 802 ) ; (4) in subparagraph (C), by inserting an offense relating to before illicit trafficking in firearms ; (5) in subparagraph (I), by striking or 2252 and inserting 2252, or 2252A ; (6) in subparagraph (F), by striking for which the term of imprisonment is at least one year; and inserting , including offenses of assault and battery under State or Federal law, for which the term of imprisonment is at least one year, except that if the conviction records do not conclusively establish whether a crime constitutes a crime of violence, the Attorney General or the Secretary of Homeland Security, as appropriate, may consider other evidence related to the conviction that establishes that the conduct for which the alien was engaged constitutes a crime of violence; ; (7) by striking subparagraph (G) and inserting the following: (G) an offense relating to a theft under State or Federal law (including theft by deceit, theft by fraud, and receipt of stolen property) regardless of whether any taking was temporary or permanent, or burglary offense under State or Federal law for which the term of imprisonment is at least one year, except that if the conviction records do not conclusively establish whether a crime constitutes a theft or burglary offense, the Attorney General or Secretary of Homeland Security, as appropriate, may consider other evidence related to the conviction that establishes that the conduct for which the alien was engaged constitutes a theft or burglary offense; ; (8) in subparagraph (N)— (A) by striking paragraph (1)(A) or (2) of