; and (3) in section 404 ( 21 U.S.C. 844 ), by inserting after subsection (a) the following: (b) A person shall not be subject to a criminal or civil penalty under this title or under any other Federal law solely for possession of a schedule A controlled substance. . (b) Controlled Substances Import and Export Act Section 1010(b) of the Controlled Substances Import and Export Act ( 21 U.S.C. 960(b) ) is amended by adding at the end the following: (8) In the case of a violation under subsection (a) involving a controlled substance in schedule A, the person committing such violation shall be sentenced to a term of imprisonment of not more than 20 years and if death or serious bodily injury results from the use of such substance shall be sentenced to a term of imprisonment of not less than 20 years and not more than life, a fine not to exceed the greater of that authorized in accordance with the provisions of title 18, United States Code, or $1,000,000 if the defendant is an individual or $5,000,000 if the defendant is other than an individual, or both. If any person commits such a violation after a prior conviction for a felony drug offense has become final, such person shall be sentenced to a term of imprisonment of not more than 30 years and if death or serious bodily injury results from the use of such substance shall be sentenced to life imprisonment, a fine not to exceed the greater of twice that authorized in accordance with the provisions of title 18, United States Code, or $2,000,000 if the defendant is an individual or $10,000,000 if the defendant is other than an individual, or both. Notwithstanding section 3583 of title 18, United States Code, any sentence imposing a term of imprisonment under this paragraph shall, in the absence of such a prior conviction, impose a term of supervised release of not less than 3 years in addition to such term of imprisonment and shall, if there was such a prior conviction, impose a term of supervised release of not less than 6 years in addition to such term of