SB 1004 and HB 573 (2007)