shortfalls Not later than 2 years after the date of enactment of this section, and each year thereafter until 2023, the Administrator of the Federal Emergency Management Agency shall submit a report to Congress on the number of instances and the estimated amounts involved, by State, for cases in which self-insurance amounts have been insufficient to address flood damages. 1241. Post disaster building safety assessment (a) Building safety assessment team (1) In general The Administrator shall coordinate with State and local governments and organizations representing design professionals, such as architects and engineers, to develop guidance, including best practices, for post-disaster assessment of buildings by licensed architects and engineers to ensure the design professionals properly analyze the structural integrity and livability of buildings and structures. (2) Publication The Administrator shall publish the guidance required to be developed under paragraph (1) not later than 1 year after the date of enactment of this Act. (b) National incident management system The Administrator shall revise or issue guidance as required to the National Incident Management System Resource Management component to ensure the functions of post-disaster building safety assessment, such as those functions performed by design professionals are accurately resource typed within the National Incident Management System. (c) Effective date This section shall be effective on the date of enactment of this Act. 1242. FEMA updates on national preparedness assessment Not later than 6 months after the date of enactment of this Act, and every 6 months thereafter until completion, the Administrator shall submit to the Committee on Homeland Security and Governmental Affairs of the Senate and the Committees on Transportation and Infrastructure and Homeland Security of the House of Representatives an update on the progress of the Agency in completing action 6 with respect to the report published by the Government Accountability Office entitled