; and (2) in section 216A(e) ( 8 U.S.C. 1186b(e) ), by inserting , if the alien has had the conditional basis removed pursuant to this section before the period at the end. 1606. Prohibition on terrorists and aliens who pose a threat to national security or public safety from receiving an adjustment of status (a) Application for adjustment of status in the United States (1) In general Section 245 of the Immigration and Nationality Act ( 8 U.S.C. 1255 ) is amended by striking the section heading and subsection (a) and inserting the following: 245. Adjustment of status to that of a person admitted for permanent residence (a) In general (1) Eligibility for adjustment The status of an alien who was inspected and admitted or paroled into the United States or the status of any other alien having an approved petition for classification as a VAWA self-petitioner may be adjusted by the Secretary or the Attorney General, in the discretion of the Secretary or the Attorney General, and under such regulations as the Secretary or the Attorney General may prescribe, to that of an alien lawfully admitted for permanent residence if— (A) the alien makes an application for such adjustment; (B) the alien is eligible to receive an immigrant visa, is admissible to the United States for permanent residence, and is not subject to exclusion, deportation, or removal from the United States