; and (2) by adding at the end the following new subparagraph: (B) Risk-based assignments (i) In general Assignments under subparagraph (A) shall be made— (I) in a risk-based manner; (II) considering the criteria described in clause (ii)