; (ii) inserting ( 34 U.S.C. 10171(a)(2) ) after section 515(a)(2) ; (iii) inserting ( 34 U.S.C. 10171(a)(3) ) after section 515(a)(3) ; and (iv) inserting ( 34 U.S.C. 10171(a)(4) ) after section 515(a)(4) . (B) Subsection (b) is amended by inserting ( 34 U.S.C. 10171(a)(1) , (3)) after section 515(a) . (16) Section 517(a)(1) of the Omnibus Crime Control and Safe Streets Act of 1968 ( 34 U.S.C. 10181(a)(1) ) is amended by inserting ( 34 U.S.C. 10171 ) after section 515 . (17) Section 520 of the Omnibus Crime Control and Safe Streets Act of 1968 ( 34 U.S.C. 10201 ) is amended as follows: (A) Subsection (a)(2) is amended by striking section 505 (formula grants) and section 515 (discretionary grants) and inserting section 505 ( 34 U.S.C. 10156 ) (formula grants) and section 515 ( 34 U.S.C. 10171 ) (discretionary grants) . (B) Subsection (b)(2) is amended by striking section 505 (formula grants) and inserting section 505 ( 34 U.S.C. 10156 ) (formula grants) . (18) Section 521(c)(2) of the Omnibus Crime Control and Safe Streets Act of 1968 ( 34 U.S.C. 10202(c)(2) ) is amended by inserting ( 34 U.S.C. 10533 ) after section 2503 . (19) Section 522(a) (matter before paragraph (1)) of the Omnibus Crime Control and Safe Streets Act of 1968 ( 34 U.S.C. 10203(a) (matter before paragraph (1))) is amended by inserting ( 34 U.S.C. 10156 ) after section 505 . (20) Section 801(b) of the Omnibus Crime Control and Safe Streets Act of 1968 ( 34 U.S.C. 10221(b) ) is amended as follows: (A) The matter before paragraph (1) is amended by inserting ( 34 U.S.C. 10151 et seq., 10321, 10331 et seq., 10351 et seq., 10461 et seq.) after parts E, M, N, O, and U . (B) The matter after paragraph (5) is amended by— (i) inserting ( 34 U.S.C. 10151 et seq.) after applicants under subpart 1 of part E