Resolve Water Supply Issues