Good thought about the water. I only drive water and unsweetened fruit juice. Sometimes I'll put a lemon or strawberry in the water. If it is safe to do so for you, I drink about a gallon of water a day. I have dehydration issues. So the more water for me the better.
