HB 658/SB 1407