yeh I do the water trick often.

I've been thinking of just doing a simple - no drinks past midnight. yet to be tested in practice.