It sounds like you have this down pretty good. Just in the way of suggestion, I would advise taking your 20 oz. every 90 minutes by drinking about 3 oz every 15 minutes for consistency, but it really doesn't matter that much (by the way, I found that 3 oz of fluid is one good size mouthful, so it helps when trying to measure without a measuring cup or something). Honestly, 20 oz. seems just a bit much water. Nevertheless, if your creatinine clearance was in range then you should be OK. I would also highly suggest using gatorade instead of water as my experimenting and practicing showed that this helped increase my specific gravity quite a bit. I also added only 1/4 tsp of salt to each 32oz bottle of gatorade--adding more salt that this actually does NOT help and will make your eyes bloodshot red (raises bloodpressure) and making you look really stoned, LOL.

As for the color, having literally tested this nearly 100 times, I know that you shouldn't need more than 14 mg of B2--if you take much more than this then your urine will look like a neon highlighter (a red flag to some testers). Also, if you really want it to look great with color, add in between 750mg--1000mg of vitamin C, which will help make the color look a bit more natural.

Good luck! Trust me, if I could pass with dilution, almost anyone can, so long as they have a few days to practice, practice, practice.