Bill to change drug offense handling