Amend HB 525 (house committee report) as follows:
(1) On page 2, line 19, after "convicted of", insert ":
(A)".
(2) On page 2, line 21, between the underlined semicolon and "and", insert the following:
(B) an offense under Section 21.16, Penal Code, as added by Chapter 852 (SB1135), Acts of the 84th Legislature, Regular Session, 2015; or
(C) any combination of offenses described by Paragraph (A) or (B);
(3) On page 3, lines 1 and 2, strike "with respect to which the applicable affirmative finding was made".
(4) On page 3, line 10, between "offenses" and "for", insert "described by Subsection (a)".
(5) On page 3, lines 11 and 12, strike "and for which the court made an affirmative finding under Article 42.013 or 42.015, Code of Criminal Procedure".
(6) On page 4, at the end of line 21, insert "described by Subsection (a) of that section".
(7) On page 4, lines 22 through 24, strike "for which an affirmative finding is made under Article 42.013 or 42.015, Code of Criminal Procedure".