; and (2) in section 3311(a) ( 42 U.S.C. 300mm–21(a) )— (A) in paragraph (2)(C)(i)— (i) in subclause (I), by striking ; or and inserting a semicolon; (ii) in subclause (II), by striking ; and and inserting a semicolon; and (iii) by adding at the end the following: (III) was an employee of the Department of Defense or any other Federal agency, worked during the period beginning on September 11, 2001, and ending on September 18, 2001, for a contractor of the Department of Defense or any other Federal agency, or was a member of a regular or reserve component of the uniformed services; and performed rescue, recovery, demolition, debris cleanup, or other related services at the Pentagon site of the terrorist-related aircraft crash of September 11, 2001, during the period beginning on September 11, 2001, and ending on the date on which the cleanup of the site was concluded, as determined by the WTC Program Administrator; or (IV) was an employee of the Department of Defense or any other Federal agency, worked during the period beginning on September 11, 2001, and ending on September 18, 2001, for a contractor of the Department of Defense or any other Federal agency, or was a member of a regular or reserve component of the uniformed services; and performed rescue, recovery, demolition, debris cleanup, or other related services at the Shanksville, Pennsylvania, site of the terrorist-related aircraft crash of September 11, 2001, during the period beginning on September 11, 2001, and ending on the date on which the cleanup of the site was concluded, as determined by the WTC Program Administrator; and ; and (B) in paragraph (4)(A)— (i) by striking (A) In general .—The and inserting the following: (A) Limit (i) In general The ; (ii) by inserting or subclause (III) or (IV) of paragraph (2)(C)(i) after or (2)(A)(ii)