Get some extra pouches too; they don't last terribly long.
Right, which is why you carry an roll-up water bag, then you can prefill from any water source.