; and (3) in section 102(c)(3) ( 34 U.S.C. 40912(c)(3) )— (A) in the paragraph heading, by striking as a mental defective or committed to a mental institution and inserting mentally incompetent or committed to a psychiatric hospital ; and (B) by striking mental institutions and inserting psychiatric hospitals . 6. Conditions for treatment of certain persons as adjudicated mentally incompetent for certain purposes (a) In general Chapter 55 of title 38, United States Code, is amended by adding at the end the following: 5511. Conditions for treatment of certain persons as adjudicated mentally incompetent for certain purposes In any case arising out of the administration by the Secretary of laws and benefits under this title, a person who is mentally incapacitated, deemed mentally incompetent, or experiencing an extended loss of consciousness shall not be considered adjudicated as mentally incompetent under subsection (d)(4) or (g)(4) of section 922 of title 18 without the order or finding of a judge, magistrate, or other judicial authority of competent jurisdiction that such person is a danger to himself or herself or others. . (b) Technical and conforming amendment The table of sections at the beginning of chapter 55 of title 38, United States Code, is amended by adding at the end the following: 5511. Conditions for treatment of certain persons as adjudicated mentally incompetent for certain purposes. . 7. Reports and certifications to Congress (a) NICS reports Not later than October 1, 2025, and every year thereafter, the head of each agency that possesses relevant Federal records shall submit a report to Congress that includes— (1) a description of the relevant Federal records possessed by the agency that can be shared with NICS in a manner consistent with applicable law; (2) the number of relevant Federal records the agency submitted to NICS during the reporting period; (3) efforts made to increase the percentage of relevant Federal records possessed by the agency that are submitted to NICS