Yes. During weeks when water feels ok I take advantage of that and drink as much as possible. Having a fun water bottle always available helps because sometimes I’m like, the water right here is more worth it than a fun drink I have to go out of my way to get. Also sometimes, with the right water bottle, the act of drinking from it can be calming and a way to reset. Sometimes turns out the thing annoying and distracting me was thirst so it’s both a calming act and solves a bit of my problem.