Amendments to Notice and Demand Provisions for DWI Cases