; and (B) in paragraph (2)— (i) by striking under subsections (e) and (f) and inserting under subsections (e), (f), and (o) ; and (ii) in subparagraph (A), by striking offender ; (6) in subsection (e)(1), by striking offender ; (7) in subsection (f)— (A) in paragraph (1)(B), by striking offender ; (B) in paragraph (2)— (i) in subparagraph (B), by striking offenders and inserting individuals who are incarcerated ; and (ii) in subparagraph (D), by striking offenders and inserting individuals who are incarcerated ; and (C) in paragraph (3)— (i) in subparagraph (A)— (I) by striking and juvenile facilities and inserting juvenile facilities, and halfway houses ; and (II) by striking offenders and inserting individuals ; (ii) in subparagraph (B)— (I) in clause (ii), by striking offenders and inserting individuals ; (II) in clause (ii), by striking prisons, jails, and juvenile facilities and inserting a prison, jail, juvenile facility, or halfway house ; and (III) in clause (iii), by striking offenders and inserting individuals who are incarcerated or who were incarcerated ; (iii) in subparagraph (C)(ii)— (I) by striking an offender and inserting an incarcerated individual ; and (II) by striking that offenders and inserting that such individuals ; (iv) in subparagraph (F), by striking offenders and inserting individuals who are incarcerated ; and (v) in subparagraph (G)— (I) by striking offenders with histories and inserting individuals who are incarcerated or who were incarcerated and who have a history ; and (II) by striking offender in each place it occurs and inserting individual ; (8) in subsection (h)— (A) in paragraph (1)— (i) by striking offenders and inserting individuals ; (ii) by striking subsection (f) each place such term appears and inserting subsection (f) or (o) ; and (iii) by striking prison, jail or a juvenile facility and inserting a prison, jail, juvenile facility, or halfway house