; and (3) in subsection (h)— (A) by striking The Attorney General may, in his discretion, waive the application of subparagraphs (A)(i)(I), (B), (D), and (E) of subsection (a)(2) and inserting The Attorney General or the Secretary of Homeland Security may, in the discretion of the Attorney General or the Secretary, waive the application of subparagraphs (A)(i)(I), (III), (B), (D), (E), (K), and (M) of subsection (a)(2) ; (B) by striking a criminal act involving torture. and inserting a criminal act involving torture, or has been convicted of an aggravated felony. ; (C) by striking if either since the date of such admission the alien has been convicted of an aggravated felony or the alien and inserting if since the date of such admission the alien ; and (D) by inserting or Secretary of Homeland Security after the Attorney General each place it appears. (b) Deportability; criminal offenses Section 237(a)(3)(B) of the Immigration and Nationality Act ( 8 U.S.C. 1227(a)(3)(B) ) is amended— (1) in clause (ii), by striking or at the end; (2) in clause (iii), by inserting or at the end; and (3) by inserting after clause (iii) the following: (iv) of a violation of, or an attempt or a conspiracy to violate, section 1425(a) or (b) of title 18 (relating to the procurement of citizenship or naturalization unlawfully), . (c) Deportability