; (ii) facilitates enforcement of traffic safety laws; (iii) provides infrastructure and infrastructure-related equipment to support emergency services; (iv) conducts safety-related research to evaluate experimental safety countermeasures or equipment; or (v) supports safe routes to school noninfrastructure-related activities described under section 211(e)(2). ; and (E) by adding at the end the following: (15) Vulnerable road user The term vulnerable road user means a nonmotorist— (A) with a fatality analysis reporting system person attribute code that is included in the definition of the term number of non-motorized fatalities in section 490.205 of title 23, Code of Federal Regulations (or successor regulation); or (B) described in the term number of non-motorized serious injuries in such section. (16) Vulnerable road user safety assessment The term vulnerable road user safety assessment means an assessment of the safety performance of the State with respect to vulnerable road users and the plan of the State to improve the safety of vulnerable road users described in subsection (l). ; (2) in subsection (c)— (A) in paragraph (1) by striking (a)(11) and inserting (a)(13) ; and (B) in paragraph (2)— (i) in subparagraph (A)(vi) by inserting , consistent with the vulnerable road user safety assessment after nonmotorized crashes ; (ii) in subparagraph (B)(i)— (I) by inserting , consistent with a safe system approach, after identify ; (II) by inserting excessive design speeds and speed limits, after crossing needs, ; and (III) by striking motorists (including motorcyclists), bicyclists, pedestrians, and other highway users and inserting road users ; and (iii) in subparagraph (D)(iii) by striking motorists (including motorcyclists), bicyclists, pedestrians, persons with disabilities, and other highway users and inserting road users ; (3) in subsection (d)— (A) in paragraph (1)— (i) in subparagraph (A) by striking Not later than 1 year after the date of enactment of the MAP–21, the and inserting The