A more thorough smoking history would be nice instead of just the last fews days and more specific than a whole lot. If you drink 2-3 gallons of water before your test you are almost assured a dilute negative. Read the substitution sticky because your method is way off from the fluid of choice to the amount of fluid.