The city is looking to upgrade to an as-needed agreement with the California State Water Project, instead of strict emergencies only.