House Bill 658/Senate Bill 1407