Fucktons of water will not help you get cleaner quicker. Drinking lots of fluid on the day of the test is the dilution method and water is not the preferred fluid. If you are a heavy smoker you should scrap the dilution and detox and either get clean pee from a friend or order synthetic pee and sub for your test.