Is North Marin Water better prepared for drought today?