Probably noncarbonated.  I might drink a can of carbonated water once a day, but probably not more than that.  I think I have to just start really keeping track of it and drink more basically.  I have some flavored electrolyte packets too that I'm gonna start using.