; ; (B) in subparagraph (E), by inserting , including threat information from other relevant Federal agencies and field offices, as appropriate before the semicolon at the end; and (C) in subparagraph (I), by striking target and inserting core ; and (2) in paragraph (2), by striking target and inserting core . (b) Review Not later than 90 days after the date of the enactment of this Act, the Secretary of Homeland Security, through the Administrator of the Federal Emergency Management Agency, shall review and report to the Committee on Homeland Security and the Committee on Appropriations of the House of Representatives and the Committee on Homeland Security and Governmental Affairs and the Committee on Appropriations of the Senate on the risk formula and methodology used to award grants under sections 2003 and 2004 of the Homeland Security Act of 2002 ( 6 U.S.C. 604 and 605), including a discussion of any necessary changes to such formula to ensure grant awards are appropriately based on risk. (c) Comptroller General review Not later than 180 days after the date of enactment of this Act, the Comptroller General of the United States shall review and assess the risk formula and methodology used to award grants under sections 2003 and 2004 of the Homeland Security Act of 2002, including— (1) the process utilized by the Department of Homeland Security to gather threat information for each potential State and high-risk urban area; (2) the extent to which such risk formula and methodology considers the factors specified in section 2007 of the Homeland Security Act of 2002 ( 6 U.S.C. 608 ), in particular— (A) the extent to which the jurisdiction has unmet core capabilities due to resource constraints; (B) the degree to which a jurisdiction has been able to address capability gaps with previous grant awards