3621A. Post-sentencing risk and needs assessment system. . 2 Oversight of Mental Health and Substance Abuse Treatment 60603. Authorizing grants to States for the use of medication-assisted treatment for heroin, opioid, or alcohol abuse in residential substance abuse treatment (a) In general Section 1904 of the Omnibus Crime Control and Safe Streets Act of 1968 ( 42 U.S.C. 3796ff–3 ) is amended— (1) in subsection (d), by striking pharmacological treatment and inserting pharmacological treatment or medication assisted treatment not subject to diversion