diff --git a/Makefile.in b/Makefile.in
index 1c3307033..ab9ba3912 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -823,9 +823,11 @@ shm_main.lo shm_main.o: $(srcdir)/util/shm_side/shm_main.c config.h $(srcdir)/ut
  $(srcdir)/util/fptr_wlist.h $(srcdir)/util/tube.h
 authzone.lo authzone.o: $(srcdir)/services/authzone.c config.h $(srcdir)/services/authzone.h \
  $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/dname.h \
- $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \
- $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/util/config_file.h $(srcdir)/services/cache/dns.h \
- $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/str2wire.h \
+ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h \
+ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgencode.h \
+ $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/util/netevent.h $(srcdir)/dnscrypt/dnscrypt.h \
+  $(srcdir)/dnscrypt/cert.h $(srcdir)/util/config_file.h \
+ $(srcdir)/util/module.h $(srcdir)/services/cache/dns.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/str2wire.h \
  $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/parseutil.h $(srcdir)/validator/val_nsec3.h \
  $(srcdir)/validator/val_secalgo.h
 fptr_wlist.lo fptr_wlist.o: $(srcdir)/util/fptr_wlist.c config.h $(srcdir)/util/fptr_wlist.h \
@@ -1313,8 +1315,8 @@ unbound-checkconf.lo unbound-checkconf.o: $(srcdir)/smallapp/unbound-checkconf.c
  $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/iterator/iter_fwd.h \
  $(srcdir)/util/rbtree.h $(srcdir)/iterator/iter_hints.h $(srcdir)/util/storage/dnstree.h \
  $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h $(srcdir)/services/localzone.h \
- $(srcdir)/services/view.h $(srcdir)/respip/respip.h $(srcdir)/sldns/sbuffer.h $(PYTHONMOD_HEADER) \
- $(srcdir)/edns-subnet/subnet-whitelist.h
+ $(srcdir)/services/view.h $(srcdir)/services/authzone.h $(srcdir)/respip/respip.h $(srcdir)/sldns/sbuffer.h \
+ $(PYTHONMOD_HEADER) $(srcdir)/edns-subnet/subnet-whitelist.h
 worker_cb.lo worker_cb.o: $(srcdir)/smallapp/worker_cb.c config.h $(srcdir)/libunbound/context.h \
  $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h \
  $(srcdir)/libunbound/unbound.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \
diff --git a/doc/Changelog b/doc/Changelog
index fef3a9df5..d7635b704 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -16,6 +16,7 @@
 	The `dnscrypt-provider-cert-rotated` allow to instruct unbound to not
 	publish the cert as part of the DNS's provider_name's TXT answer.
 	- Better documentation for cache-max-negative-ttl.
+	- Work on local root zone code.
 
 10 October 2017: Wouter 
 	- tag 1.6.7
diff --git a/doc/example.conf.in b/doc/example.conf.in
index 6da122b8d..a3472f9dd 100644
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -808,6 +808,30 @@ remote-control:
 # 	name: "example.org"
 # 	forward-host: fwd.example.com
 
+# Authority zones
+# The data for these zones is kept locally, from a file or downloaded.
+# The data can be served to downstream clients, or used instead of the
+# upstream (which saves a lookup to the upstream).  The first example
+# has a copy of the root for local usage.  The second serves example.org
+# authoritatively.  zonefile: reads from file (and writes to it if you also
+# download it), master: fetches with AXFR, url: fetches zonefile over http.
+# auth-zone:
+#	name: "."
+#	for-downstream: no
+#	for-upstream: yes
+#	master: b.root-servers.net
+#	master: c.root-servers.net
+#	master: e.root-servers.net
+#	master: f.root-servers.net
+#	master: g.root-servers.net
+#	master: k.root-servers.net
+# auth-zone:
+#	name: "example.org"
+#	for-downstream: yes
+#	for-upstream: yes
+#	zonefile: "example.org.zone"
+#	url: "http://www.example.com/example.org.zone"
+
 # Views
 # Create named views. Name must be unique. Map views to requests using
 # the access-control-view option. Views can contain zero or more local-zone
diff --git a/services/authzone.c b/services/authzone.c
index 88beddbf9..477056796 100644
--- a/services/authzone.c
+++ b/services/authzone.c
@@ -44,12 +44,16 @@
 #include "config.h"
 #include "services/authzone.h"
 #include "util/data/dname.h"
+#include "util/data/msgparse.h"
 #include "util/data/msgreply.h"
+#include "util/data/msgencode.h"
 #include "util/data/packed_rrset.h"
 #include "util/regional.h"
 #include "util/net_help.h"
+#include "util/netevent.h"
 #include "util/config_file.h"
 #include "util/log.h"
+#include "util/module.h"
 #include "services/cache/dns.h"
 #include "sldns/rrdef.h"
 #include "sldns/pkthdr.h"
@@ -252,9 +256,11 @@ struct auth_zones* auth_zones_create(void)
 		return NULL;
 	}
 	rbtree_init(&az->ztree, &auth_zone_cmp);
+	rbtree_init(&az->xtree, &auth_xfer_cmp);
 	lock_rw_init(&az->lock);
 	lock_protect(&az->lock, &az->ztree, sizeof(az->ztree));
-	/* also lock protects the rbnode's in struct auth_zone */
+	lock_protect(&az->lock, &az->xtree, sizeof(az->xtree));
+	/* also lock protects the rbnode's in struct auth_zone, auth_xfer */
 	return az;
 }
 
@@ -285,6 +291,23 @@ int auth_data_cmp(const void* z1, const void* z2)
 		b->namelabs, &m);
 }
 
+int auth_xfer_cmp(const void* z1, const void* z2)
+{
+	/* first sort on class, so that hierarchy can be maintained within
+	 * a class */
+	struct auth_xfer* a = (struct auth_xfer*)z1;
+	struct auth_xfer* b = (struct auth_xfer*)z2;
+	int m;
+	if(a->dclass != b->dclass) {
+		if(a->dclass < b->dclass)
+			return -1;
+		return 1;
+	}
+	/* sorted such that higher zones sort before lower zones (their
+	 * contents) */
+	return dname_lab_cmp(a->name, a->namelabs, b->name, b->namelabs, &m);
+}
+
 /** delete auth rrset node */
 static void
 auth_rrset_delete(struct auth_rrset* rrset)
@@ -374,6 +397,19 @@ auth_zone_find(struct auth_zones* az, uint8_t* nm, size_t nmlen,
 	return (struct auth_zone*)rbtree_search(&az->ztree, &key);
 }
 
+struct auth_xfer*
+auth_xfer_find(struct auth_zones* az, uint8_t* nm, size_t nmlen,
+	uint16_t dclass)
+{
+	struct auth_xfer key;
+	key.node.key = &key;
+	key.dclass = dclass;
+	key.name = nm;
+	key.namelen = nmlen;
+	key.namelabs = dname_count_labels(nm);
+	return (struct auth_xfer*)rbtree_search(&az->xtree, &key);
+}
+
 /** find an auth zone or sorted less-or-equal, return true if exact */
 static int
 auth_zone_find_less_equal(struct auth_zones* az, uint8_t* nm, size_t nmlen,
@@ -437,6 +473,23 @@ auth_zones_find_or_add_zone(struct auth_zones* az, char* name)
 	return z;
 }
 
+/** find or create xfer zone with name str. caller must have lock on az. 
+ * returns a locked xfer */
+static struct auth_xfer*
+auth_zones_find_or_add_xfer(struct auth_zones* az, struct auth_zone* z)
+{
+	struct auth_xfer* x;
+	x = auth_xfer_find(az, z->name, z->namelen, z->dclass);
+	if(!x) {
+		/* not found, create the zone */
+		x = auth_xfer_create(az, z);
+		lock_basic_lock(&x->lock);
+	} else {
+		lock_basic_lock(&x->lock);
+	}
+	return x;
+}
+
 int
 auth_zone_set_zonefile(struct auth_zone* z, char* zonefile)
 {
@@ -1052,6 +1105,13 @@ auth_zone_read_zonefile(struct auth_zone* z)
 	in = fopen(z->zonefile, "r");
 	if(!in) {
 		char* n = sldns_wire2str_dname(z->name, z->namelen);
+		if(z->zone_is_slave && errno == ENOENT) {
+			/* we fetch the zone contents later, no file yet */
+			verbose(VERB_ALGO, "no zonefile %s for %s",
+				z->zonefile, n?n:"error");
+			free(n);
+			return 1;
+		}
 		log_err("cannot open zonefile %s for %s: %s",
 			z->zonefile, n?n:"error", strerror(errno));
 		free(n);
@@ -1185,68 +1245,177 @@ auth_zones_read_zones(struct auth_zones* az)
 	return 1;
 }
 
-/** set str2list with (zonename, zonefile) config items and create zones */
-static int
-auth_zones_cfg_zonefile(struct auth_zones* az, struct config_str2list* zlist)
+/** setup all auth zones */
+int
+auth_zones_setup_zones(struct auth_zones* az, struct module_env* env)
 {
 	struct auth_zone* z;
-	while(zlist) {
-		lock_rw_wrlock(&az->lock);
-		if(!(z=auth_zones_find_or_add_zone(az, zlist->str))) {
+	struct auth_xfer* x;
+	lock_rw_wrlock(&az->lock);
+	RBTREE_FOR(z, struct auth_zone*, &az->ztree) {
+		lock_rw_wrlock(&z->lock);
+		x = auth_xfer_find(az, z->name, z->namelen, z->dclass);
+		if(x) {
+			lock_basic_lock(&x->lock);
+		}
+		if(!auth_xfer_setup(z, x, env)) {
+			if(x) {
+				lock_basic_unlock(&x->lock);
+			}
+			lock_rw_unlock(&z->lock);
 			lock_rw_unlock(&az->lock);
 			return 0;
 		}
-		lock_rw_unlock(&az->lock);
-		if(!auth_zone_set_zonefile(z, zlist->str2)) {
-			lock_rw_unlock(&z->lock);
-			return 0;
+		if(x) {
+			lock_basic_unlock(&x->lock);
 		}
 		lock_rw_unlock(&z->lock);
-		zlist = zlist->next;
 	}
+	lock_rw_unlock(&az->lock);
 	return 1;
 }
 
-/** set str2list with (zonename, fallback) config items and create zones */
+/** set config items and create zones */
 static int
-auth_zones_cfg_fallback(struct auth_zones* az, struct config_str2list* zlist)
+auth_zones_cfg(struct auth_zones* az, struct config_auth* c)
 {
 	struct auth_zone* z;
-	while(zlist) {
-		lock_rw_wrlock(&az->lock);
-		if(!(z=auth_zones_find_or_add_zone(az, zlist->str))) {
-			lock_rw_unlock(&az->lock);
-			return 0;
-		}
+	struct auth_xfer* x = NULL;
+
+	/* create zone */
+	lock_rw_wrlock(&az->lock);
+	if(!(z=auth_zones_find_or_add_zone(az, c->name))) {
 		lock_rw_unlock(&az->lock);
-		if(!auth_zone_set_fallback(z, zlist->str2)) {
+		return 0;
+	}
+	if(c->masters || c->urls) {
+		if(!(x=auth_zones_find_or_add_xfer(az, z))) {
+			lock_rw_unlock(&az->lock);
 			lock_rw_unlock(&z->lock);
 			return 0;
 		}
-		lock_rw_unlock(&z->lock);
-		zlist = zlist->next;
 	}
+	if(c->for_downstream)
+		az->have_downstream = 1;
+	lock_rw_unlock(&az->lock);
+
+	/* set options */
+	if(!auth_zone_set_zonefile(z, c->zonefile)) {
+		if(x) {
+			lock_basic_unlock(&x->lock);
+		}
+		lock_rw_unlock(&z->lock);
+		return 0;
+	}
+	z->for_downstream = c->for_downstream;
+	z->for_upstream = c->for_upstream;
+	/* TODO fallback option */
+	//if(!auth_zone_set_fallback(z, zlist->str2)) {
+	/* TODO other options */
+
+	/* xfer zone */
+	if(x) {
+		z->zone_is_slave = 1;
+		/* set options on xfer zone */
+		if(!xfer_set_masters(&x->task_probe->masters, c)) {
+			lock_basic_unlock(&x->lock);
+			lock_rw_unlock(&z->lock);
+			return 0;
+		}
+		if(!xfer_set_masters(&x->task_transfer->masters, c)) {
+			lock_basic_unlock(&x->lock);
+			lock_rw_unlock(&z->lock);
+			return 0;
+		}
+		lock_basic_unlock(&x->lock);
+	}
+
+	lock_rw_unlock(&z->lock);
 	return 1;
 }
 
-int auth_zones_apply_config(struct auth_zones* az, struct config_file* cfg)
+int auth_zones_apply_cfg(struct auth_zones* az, struct config_file* cfg)
 {
-	(void)cfg;
-	/* TODO cfg str2lists */
-	/* create config items for
-	 * auth-zone:	name: "example.com"
-	 * 		zonefile: "zones/example.com"
-	 * 		fallback: yes
-	 */
-	if(!auth_zones_cfg_zonefile(az, NULL /*cfg->auth_zones*/))
-		return 0;
-	if(!auth_zones_cfg_fallback(az, NULL /*cfg->auth_zones*/))
-		return 0;
+	struct config_auth* p;
+	for(p = cfg->auths; p; p = p->next) {
+		if(!p->name || p->name[0] == 0) {
+			log_warn("auth-zone without a name, skipped");
+			continue;
+		}
+		if(!auth_zones_cfg(az, p)) {
+			log_err("cannot config auth zone %s", p->name);
+			return 0;
+		}
+	}
 	if(!auth_zones_read_zones(az))
 		return 0;
 	return 1;
 }
 
+/** delete chunks
+ * @param at: transfer structure with chunks list.  The chunks and their
+ * 	data are freed.
+ */
+void
+auth_chunks_delete(struct auth_transfer* at)
+{
+	if(at->chunks_first) {
+		struct auth_chunk* c, *cn;
+		c = at->chunks_first;
+		while(c) {
+			cn = c->next;
+			free(c->data);
+			free(c);
+			c = cn;
+		}
+	}
+	at->chunks_first = NULL;
+	at->chunks_last = NULL;
+}
+
+/** free the masters list */
+static void
+auth_free_masters(struct auth_master* list)
+{
+	struct auth_master* n;
+	while(list) {
+		n = list->next;
+		free(list->host);
+		free(list->file);
+		free(list);
+		list = n;
+	}
+}
+
+/** delete auth xfer structure
+ * @param xfr: delete this xfer and its tasks.
+ */
+void
+auth_xfer_delete(struct auth_xfer* xfr)
+{
+	if(!xfr) return;
+	lock_basic_destroy(&xfr->lock);
+	free(xfr->name);
+	if(xfr->task_nextprobe) {
+		comm_timer_delete(xfr->task_nextprobe->timer);
+		free(xfr->task_nextprobe);
+	}
+	if(xfr->task_probe) {
+		auth_free_masters(xfr->task_probe->masters);
+		comm_point_delete(xfr->task_probe->cp);
+		free(xfr->task_probe);
+	}
+	if(xfr->task_transfer) {
+		auth_free_masters(xfr->task_transfer->masters);
+		comm_point_delete(xfr->task_transfer->cp);
+		if(xfr->task_transfer->chunks_first) {
+			auth_chunks_delete(xfr->task_transfer);
+		}
+		free(xfr->task_transfer);
+	}
+	free(xfr);
+}
+
 /** helper traverse to delete zones */
 static void
 auth_zone_del(rbnode_type* n, void* ATTR_UNUSED(arg))
@@ -1255,11 +1424,20 @@ auth_zone_del(rbnode_type* n, void* ATTR_UNUSED(arg))
 	auth_zone_delete(z);
 }
 
+/** helper traverse to delete xfer zones */
+static void
+auth_xfer_del(rbnode_type* n, void* ATTR_UNUSED(arg))
+{
+	struct auth_xfer* z = (struct auth_xfer*)n->key;
+	auth_xfer_delete(z);
+}
+
 void auth_zones_delete(struct auth_zones* az)
 {
 	if(!az) return;
 	lock_rw_destroy(&az->lock);
 	traverse_postorder(&az->ztree, auth_zone_del, NULL);
+	traverse_postorder(&az->xtree, auth_xfer_del, NULL);
 	free(az);
 }
 
@@ -1848,7 +2026,7 @@ az_nsec3_find_cover(struct auth_zone* z, uint8_t* nm, size_t nmlen,
 		!az_domain_rrset(node, LDNS_RR_TYPE_NSEC3)) {
 		node = (struct auth_data*)rbtree_previous(&node->node);
 	}
-        if((rbnode_type*)node == RBTREE_NULL)
+	if((rbnode_type*)node == RBTREE_NULL)
 		node = NULL;
 	return node;
 }
@@ -2367,3 +2545,301 @@ int auth_zones_lookup(struct auth_zones* az, struct query_info* qinfo,
 	lock_rw_unlock(&z->lock);
 	return r;
 }
+
+/** encode auth answer */
+static void
+auth_answer_encode(struct query_info* qinfo, struct module_env* env,
+	struct edns_data* edns, sldns_buffer* buf, struct regional* temp,
+	struct dns_msg* msg)
+{
+	uint16_t udpsize;
+	udpsize = edns->udp_size;
+	edns->edns_version = EDNS_ADVERTISED_VERSION;
+	edns->udp_size = EDNS_ADVERTISED_SIZE;
+	edns->ext_rcode = 0;
+	edns->bits &= EDNS_DO;
+
+	if(!inplace_cb_reply_local_call(env, qinfo, NULL, msg->rep,
+		FLAGS_GET_RCODE(msg->rep->flags), edns, temp)
+		|| !reply_info_answer_encode(qinfo, msg->rep,
+		*(uint16_t*)sldns_buffer_begin(buf),
+		sldns_buffer_read_u16_at(buf, 2),
+		buf, 0, 0, temp, udpsize, edns,
+		(int)(edns->bits&EDNS_DO), 0)) {
+		error_encode(buf, (LDNS_RCODE_SERVFAIL|BIT_AA), qinfo,
+			*(uint16_t*)sldns_buffer_begin(buf),
+			sldns_buffer_read_u16_at(buf, 2), edns);
+	}
+}
+
+/** encode auth error answer */
+static void
+auth_error_encode(struct query_info* qinfo, struct module_env* env,
+	struct edns_data* edns, sldns_buffer* buf, struct regional* temp,
+	int rcode)
+{
+	edns->edns_version = EDNS_ADVERTISED_VERSION;
+	edns->udp_size = EDNS_ADVERTISED_SIZE;
+	edns->ext_rcode = 0;
+	edns->bits &= EDNS_DO;
+
+	if(!inplace_cb_reply_local_call(env, qinfo, NULL, NULL,
+		rcode, edns, temp))
+		edns->opt_list = NULL;
+	error_encode(buf, rcode|BIT_AA, qinfo,
+		*(uint16_t*)sldns_buffer_begin(buf),
+		sldns_buffer_read_u16_at(buf, 2), edns);
+}
+
+int auth_zones_answer(struct auth_zones* az, struct module_env* env,
+	struct query_info* qinfo, struct edns_data* edns, struct sldns_buffer* buf,
+	struct regional* temp)
+{
+	struct dns_msg* msg = NULL;
+	struct auth_zone* z;
+	int r;
+	int fallback = 0;
+
+	lock_rw_rdlock(&az->lock);
+	if(!az->have_downstream) {
+		/* no downstream auth zones */
+		lock_rw_unlock(&az->lock);
+		return 0;
+	}
+	z = auth_zones_find_zone(az, qinfo);
+	if(!z) {
+		/* no zone above it */
+		lock_rw_unlock(&az->lock);
+		return 0;
+	}
+	lock_rw_unlock(&az->lock);
+	if(!z->for_downstream) {
+		lock_rw_unlock(&z->lock);
+		return 0;
+	}
+
+	/* answer it from zone z */
+	r = auth_zone_generate_answer(z, qinfo, temp, &msg, &fallback);
+	lock_rw_unlock(&z->lock);
+	if(fallback) {
+		/* fallback to regular answering (recursive) */
+		return 0;
+	}
+
+	/* encode answer */
+	if(!r)
+		auth_error_encode(qinfo, env, edns, buf, temp,
+			LDNS_RCODE_SERVFAIL);
+	else	auth_answer_encode(qinfo, env, edns, buf, temp, msg);
+
+	return 1;
+}
+
+/** the current transfer has finished, apply the results.
+ * set timer for future probe. See if zone is expired now. */
+void
+xfr_master_transferresult(struct auth_xfer* xfr)
+{
+	(void)xfr;
+	/* TODO */
+}
+
+/** the current probe has finished, inspect the results. 
+ * move on to the next master or start a transfer, or at last master,
+ * set timer for future probe. See if zone is expired now. */
+void
+xfr_master_proberesult(struct auth_xfer* xfr)
+{
+	(void)xfr;
+	/* TODO */
+}
+
+/** with current master selected, start the probe, or transfer */
+int
+xfr_master_start(struct auth_xfer* xfr)
+{
+	(void)xfr;
+	/* TODO */
+	return 0;
+}
+
+/** Find auth_zone SOA and populate the values in xfr(soa values). */
+static int
+xfr_find_soa(struct auth_zone* z, struct auth_xfer* xfr)
+{
+	struct auth_data* apex;
+	struct auth_rrset* soa;
+	struct packed_rrset_data* d;
+	apex = az_find_name(z, z->name, z->namelen);
+	if(!apex) return 0;
+	soa = az_domain_rrset(apex, LDNS_RR_TYPE_SOA);
+	if(!soa || soa->data->count==0)
+		return 0; /* no RRset or no RRs in rrset */
+	if(soa->data->rr_len[0] < 2+4*5) return 0; /* SOA too short */
+	/* SOA record ends with serial, refresh, retry, expiry, minimum,
+	 * as 4 byte fields */
+	d = soa->data;
+	xfr->have_zone = 1;
+	xfr->serial = sldns_read_uint32(d->rr_data[0]+(d->rr_len[0]-20));
+	xfr->retry = sldns_read_uint32(d->rr_data[0]+(d->rr_len[0]-16));
+	xfr->refresh = sldns_read_uint32(d->rr_data[0]+(d->rr_len[0]-12));
+	xfr->expiry = sldns_read_uint32(d->rr_data[0]+(d->rr_len[0]-8));
+	/* soa minimum at d->rr_len[0]-4 */
+	return 1;
+}
+
+/** determine next timeout for auth_xfer. Also (re)sets timer. */
+void
+xfr_set_timeout(struct auth_xfer* xfr)
+{
+	(void)xfr;
+	/* TODO */
+}
+
+/**
+ * malloc the xfer and tasks
+ * @param z: auth_zone with name of zone.
+ */
+static struct auth_xfer*
+auth_xfer_new(struct auth_zone* z)
+{
+	struct auth_xfer* xfr;
+	xfr = (struct auth_xfer*)calloc(1, sizeof(*xfr));
+	if(!xfr) return NULL;
+	xfr->name = memdup(z->name, z->namelen);
+	if(!xfr->name) {
+		free(xfr);
+		return NULL;
+	}
+	xfr->node.key = xfr;
+	xfr->namelen = z->namelen;
+	xfr->namelabs = z->namelabs;
+	xfr->dclass = z->dclass;
+
+	xfr->task_nextprobe = (struct auth_nextprobe*)calloc(1,
+		sizeof(struct auth_nextprobe));
+	if(!xfr->task_nextprobe) {
+		free(xfr->name);
+		free(xfr);
+		return NULL;
+	}
+	xfr->task_nextprobe->workernum = -1;
+	xfr->task_probe = (struct auth_probe*)calloc(1,
+		sizeof(struct auth_probe));
+	if(!xfr->task_probe) {
+		free(xfr->task_nextprobe);
+		free(xfr->name);
+		free(xfr);
+		return NULL;
+	}
+	xfr->task_probe->workernum = -1;
+	xfr->task_transfer = (struct auth_transfer*)calloc(1,
+		sizeof(struct auth_transfer));
+	if(!xfr->task_transfer) {
+		free(xfr->task_probe);
+		free(xfr->task_nextprobe);
+		free(xfr->name);
+		free(xfr);
+		return NULL;
+	}
+	xfr->task_transfer->workernum = -1;
+
+	lock_basic_init(&xfr->lock);
+	lock_protect(&xfr->lock, xfr, sizeof(*xfr));
+	lock_protect(&xfr->lock, &xfr->task_nextprobe->workernum,
+		sizeof(xfr->task_nextprobe->workernum));
+	lock_protect(&xfr->lock, &xfr->task_probe->workernum,
+		sizeof(xfr->task_probe->workernum));
+	lock_protect(&xfr->lock, &xfr->task_transfer->workernum,
+		sizeof(xfr->task_transfer->workernum));
+	return xfr;
+}
+
+/** 
+ * Setup auth_xfer zone
+ * This populates the have_zone, soa values, next_probe and so on times.
+ * Doesn't do network traffic yet, sets the timeout.
+ */
+int
+auth_xfer_setup(struct auth_zone* z, struct auth_xfer* x, struct module_env* env)
+{
+	if(!z || !x) return 1;
+	if(!xfr_find_soa(z, x)) {
+		return 1;
+	}
+	/* nextprobe setup */
+	x->task_nextprobe->next_probe = 0;
+	if(x->have_zone)
+		x->task_nextprobe->lease_time = *env->now;
+	/* nothing for probe and transfer tasks */
+	return 1;
+}
+
+/** Create auth_xfer structure.
+ * This populates the have_zone, soa values, next_probe and so on times.
+ * and sets the timeout, if a zone transfer is needed a short timeout is set.
+ * For that the auth_zone itself must exist (and read in zonefile)
+ * returns false on alloc failure. */
+struct auth_xfer*
+auth_xfer_create(struct auth_zones* az, struct auth_zone* z)
+{
+	struct auth_xfer* xfr;
+
+	/* malloc it */
+	xfr = auth_xfer_new(z);
+	if(!xfr) {
+		log_err("malloc failure");
+		return NULL;
+	}
+	/* insert in tree */
+	(void)rbtree_insert(&az->xtree, &xfr->node);
+	return xfr;
+}
+
+/** create new auth_master structure */
+static struct auth_master*
+auth_master_new(struct auth_master*** list)
+{
+	struct auth_master *m;
+	m = (struct auth_master*)calloc(1, sizeof(*m));
+	if(!m) {
+		log_err("malloc failure");
+		return NULL;
+	}
+	/* set first pointer to m, or next pointer of previous element to m */
+	(**list) = m;
+	/* store m's next pointer as future point to store at */
+	(*list) = &(m->next);
+	return m;
+}
+
+int
+xfer_set_masters(struct auth_master** list, struct config_auth* c)
+{
+	struct auth_master* m;
+	struct config_strlist* p;
+	/* list points to the first, or next pointer for the new element */
+	while(*list) {
+		list = &( (*list)->next );
+	}
+	for(p = c->masters; p; p = p->next) {
+		m = auth_master_new(&list);
+		m->ixfr = 1;
+		m->host = strdup(p->str);
+		if(!m->host) {
+			log_err("malloc failure");
+			return 0;
+		}
+	}
+	for(p = c->urls; p; p = p->next) {
+		m = auth_master_new(&list);
+		m->http = 1;
+		/* TODO parse url, get host, file */
+		m->host = strdup(p->str);
+		if(!m->host) {
+			log_err("malloc failure");
+			return 0;
+		}
+	}
+	return 1;
+}
diff --git a/services/authzone.h b/services/authzone.h
index 5b4623b65..b22810329 100644
--- a/services/authzone.h
+++ b/services/authzone.h
@@ -48,17 +48,33 @@
 struct ub_packed_rrset_key;
 struct regional;
 struct config_file;
+struct config_auth;
 struct query_info;
 struct dns_msg;
+struct edns_data;
+struct module_env;
+struct worker;
+struct comm_point;
+struct comm_timer;
+struct auth_rrset;
+struct auth_nextprobe;
+struct auth_probe;
+struct auth_transfer;
+struct auth_master;
+struct auth_chunk;
 
 /**
  * Authoritative zones, shared.
  */
 struct auth_zones {
-	/** lock on the authzone tree */
+	/** lock on the authzone trees */
 	lock_rw_type lock;
 	/** rbtree of struct auth_zone */
 	rbtree_type ztree;
+	/** rbtree of struct auth_xfer */
+	rbtree_type xtree;
+	/** do we have downstream enabled */
+	int have_downstream;
 };
 
 /**
@@ -89,10 +105,21 @@ struct auth_zone {
 	 * rbtree of struct auth_data */
 	rbtree_type data;
 
-	/* zonefile name (or NULL for no zonefile) */
+	/** zonefile name (or NULL for no zonefile) */
 	char* zonefile;
-	/* fallback to the internet on failure or ttl-expiry of auth zone */
+	/** fallback to the internet on failure or ttl-expiry of auth zone */
 	int fallback_enabled;
+	/** the zone has expired (enabled by the xfer worker), fallback
+	 * happens if that option is enabled. */
+	int zone_expired;
+	/** zone is a slave zone (it has masters) */
+	int zone_is_slave;
+	/** for downstream: this zone answers queries towards the downstream
+	 * clients */
+	int for_downstream;
+	/** for upstream: this zone answers queries that unbound intends to
+	 * send upstream. */
+	int for_upstream;
 };
 
 /**
@@ -127,6 +154,217 @@ struct auth_rrset {
 	struct packed_rrset_data* data;
 };
 
+/**
+ * Authoritative zone transfer structure.
+ * Create and destroy needs the auth_zones* biglock.
+ * The structure consists of different tasks.  Each can be unowned (-1) or
+ * owner by a worker (worker-num).  A worker can pick up a task and then do
+ * it.  This means the events (timeouts, sockets) are for that worker.
+ * 
+ * (move this to tasks).
+ * They don't have locks themselves, the worker (that owns it) uses it,
+ * also as part of callbacks, hence it has separate zonename pointers for
+ * lookup in the main zonetree.  If the zone has no transfers, this
+ * structure is not created.
+ */
+struct auth_xfer {
+	/** rbtree node, key is name and class */
+	rbnode_type node;
+
+	/** lock on this structure, and on the workernum elements of the
+	 * tasks.  First hold the tree-lock in auth_zones, find the auth_xfer,
+	 * lock this lock.  Then a worker can reassign itself to fill up
+	 * one of the tasks. 
+	 * Once it has the task assigned to it, the worker can access the
+	 * other elements of the task structure without a lock, because that
+	 * is necessary for the eventloop and callbacks from that. */
+	lock_basic_type lock;
+
+	/** zone name, in uncompressed wireformat */
+	uint8_t* name;
+	/** length of zone name */
+	size_t namelen;
+	/** number of labels in zone name */
+	int namelabs;
+	/** the class of this zone, in host byteorder.
+	 * uses 'dclass' to not conflict with c++ keyword class. */
+	uint16_t dclass;
+
+	/** task to wait for next-probe-timeout,
+	 * once timeouted, see if a SOA probe is needed, or already
+	 * in progress */
+	struct auth_nextprobe* task_nextprobe;
+
+	/** task for SOA probe.  Check if the zone can be updated */
+	struct auth_probe* task_probe;
+
+	/** Task for transfer.  Transferring and updating the zone.  This
+	 * includes trying (potentially) several upstream masters.  Downloading
+	 * and storing the zone */
+	struct auth_transfer* task_transfer;
+
+	/** a notify was received, but a zone transfer or probe was already
+	 * acted on.
+	 * However, the zone transfer could signal a newer serial number.
+	 * The serial number of that notify is saved below.  The transfer and
+	 * probe tasks should check this once done to see if they need to
+	 * restart the transfer task for the newer notify serial.
+	 * Hold the lock to access this member (and the serial).
+	 */
+	int notify_received;
+	/** serial number of the notify */
+	uint32_t notify_serial;
+
+	/* protected by the lock on the structure, information about
+	 * the loaded authority zone. */
+	/** is the zone currently considered expired? after expiry also older
+         * serial numbers are allowed (not just newer) */
+	int zone_expired;
+	/** do we have a zone (if 0, no zone data at all) */
+	int have_zone;
+
+	/** current serial (from SOA), if we have no zone, 0 */
+	uint32_t serial;
+	/** retry time (from SOA), time to wait with next_probe
+	 * if no master responds */
+	time_t retry;
+	/** refresh time (from SOA), time to wait with next_probe
+	 * if everything is fine */
+	time_t refresh;
+	/** expiry time (from SOA), time until zone data is not considered
+	 * valid any more, if no master responds within this time, either
+	 * with the current zone or a new zone. */
+	time_t expiry;
+};
+
+/**
+ * The next probe task.
+ * This task consists of waiting for the probetimeout.  It is a task because
+ * it needs an event in the eventtable.  Once the timeout has passed, that
+ * worker can (potentially) become the auth_probe worker, or if another worker
+ * is already doing that, do nothing.  Tasks becomes unowned.
+ * The probe worker, if it detects nothing has to be done picks up this task,
+ * if unowned.
+ */
+struct auth_nextprobe {
+	/** worker num (or -1 unowned) that is performing this task */
+	int workernum;
+	/* Worker pointer. Used by the worker during callbacks. */
+	struct worker* worker;
+
+	/** Timeout for next probe (for SOA) */
+	time_t next_probe;
+	/** zone lease start time (start+expiry is expiration time).
+	 * this is renewed every SOA probe and transfer.  On zone load
+	 * from zonefile it is also set (with probe set soon to check) */
+	time_t lease_time;
+	/** timeout callback for next_probe or expiry(if that is sooner).
+	 * it is on the worker's event_base */
+	struct comm_timer* timer;
+};
+
+/**
+ * The probe task.
+ * Send a SOA UDP query to see if the zone needs to be updated (or similar,
+ * potential, HTTP probe query) and check serial number.
+ * If yes, start the auth_transfer task.  If no, make sure auth_nextprobe
+ * timeout wait task is running.
+ * Needs to be a task, because the UDP query needs an event entry.
+ * This task could also be started by eg. a NOTIFY being received, even though
+ * another worker is performing the nextprobe task (and that worker keeps
+ * waiting uninterrupted).
+ */
+struct auth_probe {
+	/** worker num (or -1 unowned) that is performing this task */
+	int workernum;
+	/* Worker pointer. Used by the worker during callbacks. */
+	struct worker* worker;
+
+	/** list of upstream masters for this zone, from config */
+	struct auth_master* masters;
+
+	/** once notified, or the timeout has been reached. a scan starts. */
+	/** the scan specific target (notify source), or NULL if none */
+	struct auth_master* scan_specific;
+	/** scan tries all the upstream masters. the scan current target. 
+	 * or NULL if not working on sequential scan */
+	struct auth_master* scan_target;
+
+	/** the SOA probe udp event.
+	 * on the workers event base. */
+	struct comm_point* cp;
+};
+
+/**
+ * The transfer task.
+ * Once done, make sure the nextprobe waiting task is running, whether done
+ * with failure or success.  If failure, use shorter timeout for wait time.
+ */
+struct auth_transfer {
+	/** worker num (or -1 unowned) that is performing this task */
+	int workernum;
+	/* Worker pointer. Used by the worker during callbacks. */
+	struct worker* worker;
+
+	/** xfer data that has been transferred, the data is applied
+	 * once the transfer has completed correctly */
+	struct auth_chunk* chunks_first;
+	/** last element in chunks list (to append new data at the end) */
+	struct auth_chunk* chunks_last;
+
+	/** list of upstream masters for this zone, from config */
+	struct auth_master* masters;
+
+	/** once notified, or the timeout has been reached. a scan starts. */
+	/** the scan specific target (notify source), or NULL if none */
+	struct auth_master* scan_specific;
+	/** scan tries all the upstream masters. the scan current target. 
+	 * or NULL if not working on sequential scan */
+	struct auth_master* scan_target;
+	/** the zone transfer in progress (or NULL if in scan).  It is
+	 * from this master */
+	struct auth_master* master;
+
+	/** failed ixfr transfer, retry with axfr (to the current master),
+	 * the IXFR was 'REFUSED', 'SERVFAIL', 'NOTIMPL' or the contents of
+	 * the IXFR did not apply cleanly (out of sync, delete of nonexistent
+	 * data or add of duplicate data).  Flag is cleared once the retry
+	 * with axfr is done. */
+	int ixfr_fail;
+
+	/** the transfer (TCP) to the master.
+	 * on the workers event base. */
+	struct comm_point* cp;
+};
+
+/** auth zone master upstream, and the config settings for it */
+struct auth_master {
+	/** next master in list */
+	struct auth_master* next;
+	/** master IP address (and port), or hostname, string */
+	char* host;
+	/** for http, filename */
+	char* file;
+	/** use HTTP for this master */
+	int http;
+	/** use IXFR for this master */
+	int ixfr;
+	/** use ssl for channel */
+	int ssl;
+};
+
+/** auth zone master zone transfer data chunk */
+struct auth_chunk {
+	/** next chunk in list */
+	struct auth_chunk* next;
+	/** the data from this chunk, this is what was received.
+	 * for an IXFR that means results from comm_net tcp actions,
+	 * packets. also for an AXFR. For HTTP a zonefile chunk. */
+	uint8_t* data;
+	/** length of allocated data */
+	size_t len;
+};
+
 /**
  * Create auth zones structure
  */
@@ -135,7 +373,7 @@ struct auth_zones* auth_zones_create(void);
 /**
  * Apply configuration to auth zones.  Reads zonefiles.
  */
-int auth_zones_apply_config(struct auth_zones* az, struct config_file* cfg);
+int auth_zones_apply_cfg(struct auth_zones* az, struct config_file* cfg);
 
 /**
  * Delete auth zones structure
@@ -170,6 +408,20 @@ int auth_zones_lookup(struct auth_zones* az, struct query_info* qinfo,
 	struct regional* region, struct dns_msg** msg, int* fallback,
 	uint8_t* dp_nm, size_t dp_nmlen);
 
+/**
+ * Answer query from auth zone.  Create authoritative answer.
+ * @param az: auth zones structure.
+ * @param env: the module environment.
+ * @param qinfo: query info (parsed).
+ * @param edns: edns info (parsed).
+ * @param buf: buffer with query ID and flags, also for reply.
+ * @param temp: temporary storage region.
+ * @return false if not answered
+ */
+int auth_zones_answer(struct auth_zones* az, struct module_env* env,
+	struct query_info* qinfo, struct edns_data* edns, struct sldns_buffer* buf,
+	struct regional* temp);
+
 /** 
  * Find the auth zone that is above the given qname.
  * Return NULL when there is no auth_zone above the give name, otherwise
@@ -185,6 +437,11 @@ struct auth_zone* auth_zones_find_zone(struct auth_zones* az,
 struct auth_zone* auth_zone_find(struct auth_zones* az, uint8_t* nm,
 	size_t nmlen, uint16_t dclass);
 
+/** find an xfer zone by name (exact match by name or NULL returned) */
+struct auth_xfer* auth_xfer_find(struct auth_zones* az, uint8_t* nm,
+	size_t nmlen, uint16_t dclass);
+
+
 /** create an auth zone. returns wrlocked zone. caller must have wrlock
  * on az. returns NULL on malloc failure */
 struct auth_zone* auth_zone_create(struct auth_zones* az, uint8_t* nm,
@@ -206,4 +463,41 @@ int auth_zone_cmp(const void* z1, const void* z2);
 /** compare auth_data for sorted rbtree */
 int auth_data_cmp(const void* z1, const void* z2);
 
+/** compare auth_xfer for sorted rbtree */
+int auth_xfer_cmp(const void* z1, const void* z2);
+
+/** Create auth_xfer structure.
+ * Caller must have wrlock on az. Returns locked xfer zone.
+ * @param az: zones structure.
+ * @param z: zone with name and class
+ * @return xfer zone or NULL
+ */
+struct auth_xfer* auth_xfer_create(struct auth_zones* az, struct auth_zone* z);
+
+/**
+ * Set masters in auth xfer structure from config.
+ * @param list: pointer to start of list.  The malloced list is returned here.
+ * @param c: the config items to copy over.
+ * @return false on failure.
+ */
+int xfer_set_masters(struct auth_master** list, struct config_auth* c);
+
+/**
+ * Setup auth_xfer zone.  Populates timeouts.
+ * @param z: locked by caller, and modified for setup
+ * @param x: locked by caller, and modified, timers and timeouts.
+ * @param env: module env with time.
+ * @return false on failure.
+ */
+int auth_xfer_setup(struct auth_zone* z, struct auth_xfer* xfr,
+	struct module_env* env);
+
+/**
+ * Setup all zones
+ * @param az: auth zones structure
+ * @param env: module env with time.
+ * @return false on failure.
+ */
+int auth_zones_setup_zones(struct auth_zones* az, struct module_env* env);
+
 #endif /* SERVICES_AUTHZONE_H */
diff --git a/smallapp/unbound-checkconf.c b/smallapp/unbound-checkconf.c
index 7e9cb4740..2b6f7faef 100644
--- a/smallapp/unbound-checkconf.c
+++ b/smallapp/unbound-checkconf.c
@@ -54,6 +54,7 @@
 #include "validator/validator.h"
 #include "services/localzone.h"
 #include "services/view.h"
+#include "services/authzone.h"
 #include "respip/respip.h"
 #include "sldns/sbuffer.h"
 #ifdef HAVE_GETOPT_H
@@ -573,6 +574,17 @@ check_hints(struct config_file* cfg)
 	hints_delete(hints);
 }
 
+/** check auth zones */
+static void
+check_auth(struct config_file* cfg)
+{
+	struct auth_zones* az = auth_zones_create();
+	if(!az || !auth_zones_apply_cfg(az, cfg)) {
+		fatal_exit("Could not setup authority zones");
+	}
+	auth_zones_delete(az);
+}
+
 /** check config file */
 static void
 checkconf(const char* cfgfile, const char* opt, int final)
@@ -607,6 +619,7 @@ checkconf(const char* cfgfile, const char* opt, int final)
 #endif
 	check_fwd(cfg);
 	check_hints(cfg);
+	check_auth(cfg);
 	printf("unbound-checkconf: no errors in %s\n", cfgfile);
 	config_delete(cfg);
 }
diff --git a/util/config_file.c b/util/config_file.c
index c20d0ba89..c910a5eb8 100644
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -177,6 +177,7 @@ config_create(void)
 	cfg->out_ifs = NULL;
 	cfg->stubs = NULL;
 	cfg->forwards = NULL;
+	cfg->auths = NULL;
 #ifdef CLIENT_SUBNET
 	cfg->client_subnet = NULL;
 	cfg->client_subnet_zone = NULL;
@@ -634,7 +635,7 @@ int config_set_option(struct config_file* cfg, const char* opt,
 		 * interface, outgoing-interface, access-control,
 		 * stub-zone, name, stub-addr, stub-host, stub-prime
 		 * forward-first, stub-first, forward-ssl-upstream,
-		 * stub-ssl-upstream, forward-zone,
+		 * stub-ssl-upstream, forward-zone, auth-zone
 		 * name, forward-addr, forward-host,
 		 * ratelimit-for-domain, ratelimit-below-domain,
 		 * local-zone-tag, access-control-view,
@@ -1164,6 +1165,28 @@ config_deltrplstrlist(struct config_str3list* p)
 	}
 }
 
+void
+config_delauth(struct config_auth* p)
+{
+	if(!p) return;
+	free(p->name);
+	config_delstrlist(p->masters);
+	config_delstrlist(p->urls);
+	free(p->zonefile);
+	free(p);
+}
+
+void
+config_delauths(struct config_auth* p)
+{
+	struct config_auth* np;
+	while(p) {
+		np = p->next;
+		config_delauth(p);
+		p = np;
+	}
+}
+
 void
 config_delstub(struct config_stub* p)
 {
@@ -1249,6 +1272,7 @@ config_delete(struct config_file* cfg)
 	config_del_strarray(cfg->out_ifs, cfg->num_out_ifs);
 	config_delstubs(cfg->stubs);
 	config_delstubs(cfg->forwards);
+	config_delauths(cfg->auths);
 	config_delviews(cfg->views);
 	config_delstrlist(cfg->donotqueryaddrs);
 	config_delstrlist(cfg->root_hints);
diff --git a/util/config_file.h b/util/config_file.h
index 364d0265d..2fc6fdfb4 100644
--- a/util/config_file.h
+++ b/util/config_file.h
@@ -42,6 +42,7 @@
 #ifndef UTIL_CONFIG_FILE_H
 #define UTIL_CONFIG_FILE_H
 struct config_stub;
+struct config_auth;
 struct config_view;
 struct config_strlist;
 struct config_str2list;
@@ -170,6 +171,8 @@ struct config_file {
 	struct config_stub* stubs;
 	/** the forward zone definitions, linked list */
 	struct config_stub* forwards;
+	/** the auth zone definitions, linked list */
+	struct config_auth* auths;
 	/** the views definitions, linked list */
 	struct config_view* views;
 	/** list of donotquery addresses, linked list */
@@ -530,6 +533,26 @@ struct config_stub {
 	int ssl_upstream;
 };
 
+/**
+ * Auth config options
+ */
+struct config_auth {
+	/** next in list */
+	struct config_auth* next;
+	/** domain name (in text) of the auth apex domain */
+	char* name;
+	/** list of masters */
+	struct config_strlist* masters;
+	/** list of urls */
+	struct config_strlist* urls;
+	/** zonefile (or NULL) */
+	char* zonefile;
+	/** provide downstream answers */
+	int for_downstream;
+	/** provide upstream answers */
+	int for_upstream;
+};
+
 /**
  * View config options
  */
@@ -820,6 +843,18 @@ void config_delstub(struct config_stub* p);
  */
 void config_delstubs(struct config_stub* list);
 
+/**
+ * Delete an auth item
+ * @param p: auth item
+ */
+void config_delauth(struct config_auth* p);
+
+/**
+ * Delete items in config auth list.
+ * @param list: list.
+ */
+void config_delauths(struct config_auth* list);
+
 /**
  * Delete a view item
  * @param p: view item
diff --git a/util/configlexer.c b/util/configlexer.c
index 64d9c596c..869cfaba1 100644
--- a/util/configlexer.c
+++ b/util/configlexer.c
@@ -363,8 +363,8 @@ static void yynoreturn yy_fatal_error (yyconst char* msg  );
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 238
-#define YY_END_OF_BUFFER 239
+#define YY_NUM_RULES 244
+#define YY_END_OF_BUFFER 245
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -372,266 +372,272 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[2350] =
+static yyconst flex_int16_t yy_accept[2395] =
     {   0,
-        1,    1,  220,  220,  224,  224,  228,  228,  232,  232,
-        1,    1,  239,  236,    1,  218,  218,  237,    2,  237,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  220,  221,  221,  222,  237,  224,  225,  225,  226,
-      237,  231,  228,  229,  229,  230,  237,  232,  233,  233,
-      234,  237,  235,  219,    2,  223,  237,  235,  236,    0,
-        1,    2,    2,    2,    2,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
+        1,    1,  226,  226,  230,  230,  234,  234,  238,  238,
+        1,    1,  245,  242,    1,  224,  224,  243,    2,  243,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  226,  227,  227,  228,  243,  230,  231,  231,
+      232,  243,  237,  234,  235,  235,  236,  243,  238,  239,
+      239,  240,  243,  241,  225,    2,  229,  243,  241,  242,
+        0,    1,    2,    2,    2,    2,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
 
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  220,    0,  224,    0,  231,    0,  228,
-      232,    0,  235,    0,    2,    2,  235,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  226,    0,  230,    0,
+      237,    0,  234,  238,    0,  241,    0,    2,    2,  241,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
 
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  235,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  241,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
 
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  235,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,   77,
-      236,  236,  236,  236,  236,  236,    8,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,   91,  242,  242,  242,  242,  242,
+      242,  242,  241,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,   77,  242,  242,  242,  242,  242,
+      242,    8,  242,  242,  242,  242,  242,  242,  242,  242,
 
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,   88,
-      235,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,   94,  242,  241,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
 
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  235,
-      236,  236,  236,  236,  236,  236,  236,   37,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      170,  236,   14,   15,  236,   18,   17,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      241,  242,  242,  242,  242,  242,  242,  242,  242,   37,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  176,  242,   14,   15,  242,   18,   17,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
 
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  156,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,    3,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  235,  236,  236,  236,
-      215,  236,  236,  214,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,   90,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  162,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,    3,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  241,  242,  242,  242,  242,  221,  242,  242,
 
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  227,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,   40,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,   41,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  145,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,   20,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  103,  236,  227,  236,
+      220,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      233,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,   40,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,   41,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  151,  242,  242,  242,  242,  242,  242,  242,  242,
 
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  197,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  120,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      102,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,   75,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
+      242,  242,  242,  242,  242,  242,   20,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  109,  242,  242,  233,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  203,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  126,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  108,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
 
-      236,  236,  236,  236,  236,   25,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,   38,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,   39,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  121,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,   28,  236,  236,  236,  236,  236,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,   75,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,   25,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,   38,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,   89,  242,
+      242,   88,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,   39,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
 
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  185,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,   32,  236,
-       33,  236,  236,  236,   78,  236,   79,  236,  236,   76,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,    7,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  163,  236,  236,  236,  236,  105,  236,
+      242,  242,  242,  242,  242,  242,  127,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,   28,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  191,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,   32,  242,   33,  242,  242,
+      242,   78,  242,   79,  242,  242,   76,  242,  242,  242,
 
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-       29,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  137,  236,  136,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,   16,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,   42,  236,  236,
-      236,  236,  236,  236,  236,  144,  236,  236,  236,  236,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,    7,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      169,  242,  242,  242,  242,  111,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,   29,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  143,  242,  142,  242,  242,  242,  242,
 
-       81,   80,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  131,  236,  236,  236,  236,  236,  236,  236,  236,
-       89,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,   60,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,   64,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,   36,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  134,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,   16,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,   42,  242,  242,  242,
+      242,  242,  242,  242,  150,  242,  242,  242,  242,   81,
+       80,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      137,  242,  242,  242,  242,  242,  242,  242,  242,   95,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,   60,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
 
-      135,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,    6,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      195,  236,  236,  216,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,   26,  236,  236,  236,  236,  236,  236,  236,
-      236,  127,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  149,  236,  128,  236,  236,  161,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,   27,  236,  236,  236,  236,   84,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,   64,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,   36,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      140,  141,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,    6,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  201,  242,  242,  222,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,   26,  242,  242,  242,  242,  242,  242,
 
-      236,   85,  236,   83,  236,  236,  236,  236,  236,  236,
-      236,  236,  100,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  184,  236,  236,  236,  236,  236,
-      236,  236,  236,  129,  236,  236,  236,  236,  236,  132,
-      236,  236,  160,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,   74,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,   34,  236,  236,   22,  236,
-      236,  236,  236,   19,  236,  110,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
+      242,  242,  133,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  155,  242,  134,  242,  242,  167,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,   27,  242,  242,  242,  242,
+      242,   93,   84,  242,   85,  242,   83,  242,  242,  242,
+      242,  242,  242,  242,  242,  106,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  190,  242,  242,
+      242,  242,  242,  242,  242,  242,  135,  242,  242,  242,
+      242,  242,  138,  242,  242,  166,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,   74,
 
-      236,   49,   51,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  199,  236,  236,  236,  171,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,   86,  236,  236,  236,  236,  236,  236,
-      236,   99,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  210,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  104,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  155,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  119,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,   34,  242,
+      242,   22,  242,  242,  242,  242,   19,  242,  116,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,   49,   51,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  205,  242,
+      242,  242,  177,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,   86,  242,  242,
+      242,  242,  242,  242,  242,  105,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
 
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  115,  236,  122,  236,  236,
-      236,  236,  236,   92,  236,  236,   70,  236,  236,  236,
-      236,  147,  236,  236,  236,  236,  236,  162,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      176,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  118,  236,  236,  236,  236,  236,
-       52,   53,  236,  236,  236,  236,  236,   35,  236,  236,
-      236,  236,  236,   59,  123,  236,  138,  236,  164,  133,
-      236,  236,  236,   45,  236,  125,  236,  236,  236,  236,
+      242,  216,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  110,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  161,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  125,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  121,
+      242,  128,  242,  242,  242,  242,  242,   98,  242,  242,
+       70,  242,  242,  242,  242,  153,  242,  242,  242,  242,
+      242,  168,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  182,  242,  242,  242,  242,  242,
 
-      236,    9,  236,  236,  236,   73,  236,  236,  236,  236,
-      189,  236,  146,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  106,  198,  236,  236,  236,  236,  175,  236,
-      236,  236,  236,  236,  236,  236,  236,  157,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  213,  236,  124,  236,  236,  236,   44,   46,  236,
+       92,  242,  242,  242,  242,  242,  242,  242,  242,  124,
+      242,  242,  242,  242,  242,   52,   53,  242,  242,  242,
+      242,  242,   35,  242,  242,  242,  242,  242,   59,  129,
+      242,  144,  242,  170,  139,  242,  242,  242,   45,  242,
+      131,  242,  242,  242,  242,  242,    9,  242,  242,  242,
+       73,  242,  242,  242,  242,  195,  242,  152,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  112,  204,  242,
 
-      236,  236,  236,  236,  236,  236,   72,  236,  236,  236,
-      236,  187,  236,  194,  236,  236,  236,  236,  236,  151,
-       23,   24,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,   69,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  153,  150,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,   43,  236,  236,  236,  236,  236,  236,
-      236,  236,  101,   13,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  208,  236,  211,  236,  236,  236,  236,
-      236,  236,   12,  236,  236,   21,  236,  236,  236,  193,
+      242,  242,  242,  181,  242,  242,  242,  242,  242,  242,
+      242,  242,  163,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  219,  242,  130,  242,
+      242,  242,   44,   46,  242,  242,  242,  242,  242,  242,
+      242,   72,  242,  242,  242,  242,  193,  242,  200,  242,
+      242,  242,  242,  242,  157,   23,   24,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,   69,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  159,  156,  242,  242,  242,  242,  242,
 
-      236,  196,   47,  236,  159,  236,  152,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  114,  113,  236,  236,  236,  236,  236,  236,  236,
-      154,  148,  236,  236,  236,  200,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,   54,  236,  236,
-      236,  188,  236,  236,  236,  236,  236,  158,  236,  236,
-      236,  236,  236,  236,  236,  236,   48,  236,  236,  236,
-       82,  236,  107,  236,  109,  236,  139,  236,  236,  236,
-      112,  236,  236,  165,  236,  236,  236,  236,  236,   94,
+      242,  242,  242,  242,  242,  242,  242,  242,   43,  242,
+      242,  242,  242,  242,  242,  242,  242,  107,   13,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  214,  242,
+      217,  242,  242,  242,  242,  242,  242,   12,  242,  242,
+       21,  242,  242,  242,  199,  242,  202,   47,  242,  165,
+      242,  158,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  120,  119,  242,  242,
+      242,  242,  242,  242,  242,  160,  154,  242,  242,  242,
+      206,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
 
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  172,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  140,  236,  236,  186,  236,
-      212,  236,  236,  236,   30,  236,  236,  236,  236,    4,
-      236,  236,   93,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  168,  236,  236,  236,  236,  236,
-      236,  236,  201,  236,  236,  236,  236,  236,  236,  174,
-      236,  236,  143,  236,  236,  236,  236,  236,  236,  236,
-      236,   57,  236,   31,  192,  236,  169,  236,  236,   11,
-      236,  236,  236,  236,  236,  236,  141,   61,  236,  236,
+      242,  242,   54,  242,  242,  242,  194,  242,  242,  242,
+      242,  242,  164,  242,  242,  242,  242,  242,  242,  242,
+      242,   48,  242,  242,  242,   82,  242,  113,  242,  115,
+      242,  145,  242,  242,  242,  118,  242,  242,  171,  242,
+      242,  242,  242,  242,  100,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  178,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      146,  242,  242,  192,  242,  218,  242,  242,  242,   30,
+      242,  242,  242,  242,    4,  242,  242,   99,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  174,
 
-      236,  236,  236,  117,  236,  236,  236,  236,  236,   96,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  173,
-       90,  236,   87,  236,  236,  236,   63,   67,   62,  236,
-       55,  236,  236,  236,   10,  236,  236,  236,  190,  236,
-      236,  236,  236,  116,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,   68,   66,  236,   56,  209,  236,  236,  236,  130,
-      236,  236,  142,  236,  236,  236,  236,  236,  236,  108,
-       50,  236,  236,  236,  236,  236,  202,  236,  236,  236,
-      236,  236,  236,  236,   91,   65,   97,   98,   58,  236,
+      242,  242,  242,  242,  242,  242,  242,  207,  242,  242,
+      242,  242,  242,  242,  180,  242,  242,  149,  242,  242,
+      242,  242,  242,  242,  242,  242,   57,  242,   31,  198,
+      242,  175,  242,  242,   11,  242,  242,  242,  242,  242,
+      242,  147,   61,  242,  242,  242,  242,  242,  123,  242,
+      242,  242,  242,  242,  102,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  179,   96,  242,   87,  242,  242,
+      242,   63,   67,   62,  242,   55,  242,  242,  242,   10,
+      242,  242,  242,  196,  242,  242,  242,  242,  122,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
 
-      191,  111,  236,  236,  236,  236,  167,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,   71,  236,
-      166,  236,  183,  206,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,    5,  236,  236,  236,  207,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,   95,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  126,
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  203,
+      242,  242,  242,  242,  242,  242,   68,   66,  242,   56,
+      215,  242,  242,  242,  136,  242,  242,  148,  242,  242,
+      242,  242,  242,  242,  114,   50,  242,  242,  242,  242,
+      242,  208,  242,  242,  242,  242,  242,  242,  242,   97,
+       65,  103,  104,   58,  242,  197,  117,  242,  242,  242,
+      242,  173,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,   71,  242,  172,  242,  189,  212,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,    5,  242,
+
+      242,  242,  213,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  101,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  132,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  209,  242,  242,  242,  242,  242,
+      242,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  223,  242,  242,  185,  242,  242,  242,  242,
+      242,  210,  242,  242,  242,  242,  242,  242,  211,  242,
+      242,  242,  183,  242,  186,  187,  242,  242,  242,  242,
+      242,  184,  188,    0
 
-      236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-      236,  236,  236,  236,  236,  236,  236,  217,  236,  236,
-      179,  236,  236,  236,  236,  236,  204,  236,  236,  236,
-      236,  236,  236,  205,  236,  236,  236,  177,  236,  180,
-      181,  236,  236,  236,  236,  236,  178,  182,    0
     } ;
 
 static yyconst YY_CHAR yy_ec[256] =
@@ -674,1050 +680,1070 @@ static yyconst YY_CHAR yy_meta[41] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_uint16_t yy_base[2364] =
+static yyconst flex_uint16_t yy_base[2409] =
     {   0,
         0,    0,   38,   41,   44,   46,   59,   65,   71,   77,
-       90,  112, 3642, 3416,   81, 4607, 4607, 4607,   96,   52,
+       90,  112, 3231, 3060,   81, 4693, 4693, 4693,   96,   52,
        72,   63,  107,  111,   70,   91,  109,  124,   98,  127,
       114,  133,  136,  130,  144,  146,  163,  165,  171,  179,
-      186, 3294, 4607, 4607, 4607,  164, 3246, 4607, 4607, 4607,
-       95, 2906, 2815, 4607, 4607, 4607,  206, 2513, 4607, 4607,
-     4607,  176, 2465, 4607,  212, 4607,  216,  147, 2167,  220,
-      147,    0,  227,    0,    0,  221,  188,   97,  222,  228,
-      158,  214,  216,  229,  232,  233,  156,  240,  238,  236,
-      190,  239,  242,  243,  145,  245,  258,  254,  246,  262,
+      186,  135, 2630, 4693, 4693, 4693,  164, 2594, 4693, 4693,
+     4693,   95, 2544, 2000, 4693, 4693, 4693,  211, 1777, 4693,
+     4693, 4693,  176, 1650, 4693,  215, 4693,  219,  147, 1368,
+      223,  151,    0,  230,    0,    0,  224,  188,   97,  225,
+      231,  158,  217,  182,  232,  233,  219,  156,  242,  235,
+      237,  239,  240,  243,  190,  248,  245,  260,  262,  246,
 
-      263,  268,  269,  271,  272,  276,  274,  280,  282,  285,
-      284,  286,  290,  291,  296,  294,  300,  301,  298,  306,
-      305,  321,  237,  307,  312,  310,  322,  323,  325,  177,
-      329,  331,  332, 1744,  343, 1464,  345, 1234,  354, 1000,
-      778,  360,  336,  364,  368,    0,  360,  362,  346,  364,
-      365,  366,  353,  369,  370,  371,  373,  386,  378,  388,
-      396,  394,  395,  400,  393,  398,  402,  385,  377,  405,
-      406,  411,  413,  417,  418,  419,  421,  429,  430,  431,
-      438,  436,  446,  448,  444,  433,  449,  451,  461,  463,
-      458,  459,  460,  462,  464,  445,  468,  471,  469,  473,
+      264,  267,  254,  268,  271,  276,  272,  277,  286,  287,
+      288,  290,  291,  292,  293,  295,  298,  302,  304,  303,
+      311,  310,  326,  300,  316,  324,  327,  328,  330,  331,
+      332,  334,  335,  338,  336,  345, 1325,  360, 1024,  315,
+      994,  367,  749,  583,  362,  514,  373,  377,    0,  369,
+      371,  379,  374,  375,  340,  362,  378,  380,  383,  387,
+      390,  392,  394,  404,  402,  406,  407,  399,  409,  411,
+      419,  417,  423,  424,  425,  429,  412,  431,  432,  433,
+      443,  435,  445,  452,  449,  460,  447,  462,  459,  457,
+      464,  465,  469,  477,  472,  388,  474,  473,  475,  476,
 
-      475,  477,  478,  480,  481,  479,  492,  487,  495,  490,
-      494,  493,  508,  499,  509,  504,  511,  513,  520,  515,
-      519,  521,  522,  524,  529,  525,  535,  543,  536,  538,
-      526,  539,  546,  545,  547,  555,  527,  559,  548,  560,
-      562,  549,  558,  564,  568,  569,  577,  574,  581,  579,
-      582,  589,  576,  584,  585,  586,  590,  592,  593,  594,
-      597,  600,  603,  604,  605,  614,  609,  610,  616,  618,
-      620,  613,  619,  635,  629,  639,  630,  640,  643,  644,
-      646,  649,  656,  648,  659,  658,  651,  660,  667,  662,
-      668,  672,  669,  676,  680,  665,  677,  686,  684,  689,
+      482,  483,  484,  485,  486,  487,  492,  488,  491,  494,
+      505,  501,  509,  504,  508,  511,  521,  512,  523,  513,
+      526,  529,  536,  538,  533,  177,  534,  537,  522,  540,
+      550,  551,  542,  553,  561,  556,  543,  546,  559,  560,
+      562,  563,  565,  569,  575,  574,  576,  578,  580,  582,
+      581,  585,  586,  594,  590,  599,  598,  600,  603,  611,
+      606,  591,  607,  610,  612,  614,  615,  616,  618,  621,
+      624,  627,  625,  635,  631,  632,  638,  639,  640,  643,
+      641,  649,  650,  660,  662,  651,  657,  666,  667,  670,
+      673,  679,  674,  677,  681,  663,  684,  691,  686,  687,
 
-      688,  690,  691,  692,  697,  699,  700,  719,  705,  704,
-      729,  703,  706,  715,  716,  726,  743,  727,  732,  739,
-      741,  744,  742,  751,  746,  748,  753,  761,  754,  758,
-      763,  772,  762,  764,  765,  771,  773,  783,  784,  776,
-      777,  786,  708,  792,  789,  790,  802,  798,  801,  800,
-      805,  809,  811,  813,  815,  814,  816,  824,  821,  822,
-      823,  830,  832,  833,  831,  836,  841,  834,  847, 4607,
-      849,  838,  624,  842,  840,  852, 4607,  853,  854,  856,
-      863,  858,  861,  862,  869,  878,  865,  879,  881,  880,
-      883,  868,  884,  887,  886,  892,  893,  889,  910,  895,
+      694,  690,  696,  697,  698,  703,  704,  711,  709,  708,
+      710,  715,  716,  718, 4693,  720,  726,  741,  727,  725,
+      751,  746,  717,  728,  733,  735,  749,  754,  770,  758,
+      759,  762,  763,  766,  765,  773,  772,  775,  776,  783,
+      784,  785,  786,  796,  788,  789,  795,  798,  797,  800,
+      802,  803,  807,  810,  813,  815,  816,  814,  822,  820,
+      836,  817,  833,  840,  841,  831,  842,  832,  847,  848,
+      849,  859,  854,  834,  857,  856,  860,  863,  864,  866,
+      867,  869,  871,  877, 4693,  879,  873,  875,  882,  884,
+      885, 4693,  887,  886,  888,  895,  890,  893,  896,  900,
 
-      898,  896,  919,  904,  900,  902,  906,  914,  927,  923,
-      921,  925,  930,  931,  932,  934,  935,  941,  942, 4607,
-      946,  951,  947,  944,  957,  952,  958,  955,  967,  970,
-      968,  975,  971,  973,  972,  974,  978,  977,  982,  990,
-      986,  992,  995, 1003, 1001, 1005, 1008,  985, 1007, 1009,
-     1010, 1011, 1019, 1016, 1014, 1017, 1021, 1029, 1025, 1024,
-     1031, 1026, 1035, 1027, 1037, 1046, 1033, 1040, 1054, 1049,
-     1050, 1052, 1057, 1059, 1060, 1061, 1063, 1066, 1065, 1067,
-     1077, 1080, 1069, 1070, 1082, 1083, 1084, 1091, 1088, 1095,
-     1094, 1099, 1106, 1090, 1096, 1108, 1092, 1107, 1110, 1118,
+      909,  901,  911,  918,  913,  915,  916,  919,  922,  917,
+      923,  925,  924,  944,  929,  934,  930,  937,  935,  954,
+      939,  947,  933,  955,  961,  962,  964,  965,  966,  967,
+      968,  971,  978,  969, 4693,  973,  981,  986,  983,  987,
+      989,  992,  991,  997,  998, 1001, 1009, 1005, 1014, 1010,
+     1012, 1011, 1013, 1016, 1020, 1021, 1029, 1025, 1031, 1033,
+     1040, 1042, 1044, 1051, 1027, 1047, 1035, 1049, 1046, 1053,
+     1055, 1056, 1058, 1060, 1061, 1063, 1070, 1068, 1065, 1074,
+     1067, 1075, 1071, 1087, 1088, 1080, 1081, 1090, 1091, 1095,
+     1097, 1099, 1102, 1103, 1105, 1106, 1109, 1112, 1110, 1113,
 
-     1114, 1115, 1123, 1124, 1119, 1127, 1121, 1130, 1131, 1133,
-     1134, 1135, 1137, 1136, 1139, 1138, 1142, 1143, 1152, 1147,
-     1148, 1159, 1164, 1150, 1162, 1165, 1163, 1157, 1171, 1174,
-     1172, 1175, 1178, 1180, 1186, 1187, 1188, 1189, 1190, 1191,
-     1192, 1198, 1193, 1201, 1206, 1209, 1210, 4607, 1205, 1217,
-     1212, 1216, 1213, 1218, 1227, 1222, 1223, 1226, 1228, 1233,
-     4607, 1229, 4607, 4607, 1237, 4607, 4607, 1231, 1243, 1235,
-     1246, 1256, 1259, 1260, 1258, 1250, 1265, 1266, 1270, 1269,
-     1274, 1275, 1277, 1284, 1282, 1286, 1288, 1294, 1290, 1280,
-     1297, 1295, 1298, 1300, 1303, 1305, 1307, 1306, 1310, 1309,
+     1120, 1116, 1124, 1128, 1129, 1115, 1130, 1138, 1135, 1142,
+     1143, 1145, 1153, 1141, 1148, 1155, 1137, 1151, 1159, 1163,
+     1158, 1164, 1172, 1167, 1165, 1173, 1174, 1176, 1179, 1180,
+     1181, 1182, 1183, 1185, 1184, 1186, 1188, 1191, 1195, 1192,
+     1196, 1208, 1201, 1203, 1210, 1212, 1213, 1214, 1218, 1216,
+     1219, 1220, 1225, 1232, 1226, 1228, 1234, 1236, 1238, 1239,
+     1240, 1246, 1248, 1241, 1242, 1254, 1256, 1259, 1260, 4693,
+     1261, 1268, 1264, 1266, 1267, 1271, 1278, 1273, 1274, 1275,
+     1276, 1282, 4693, 1283, 4693, 4693, 1285, 4693, 4693, 1277,
+     1293, 1303, 1305, 1308, 1297, 1290, 1318, 1319, 1317, 1295,
 
-     1312, 1313, 1325, 1329, 1327, 1326, 1328, 1331, 1316, 1333,
-     1335, 1337, 1341, 1343, 1345, 1350, 1346, 4607, 1348, 1349,
-     1351, 1355, 1347, 1362, 1359, 1364, 1366, 1367, 1368, 4607,
-     1370, 1377, 1369, 1373, 1380, 1382, 1381, 1384, 1385, 1388,
-     1387, 1389, 1386, 1397, 1393, 1400, 1399, 1396, 1410, 1417,
-     1412, 1419, 1414, 1415, 1421, 1420, 1422, 1426, 1429, 1428,
-     1430, 1436, 1444, 1435, 1440, 1442, 1446, 1437, 1447, 1450,
-     4607, 1453, 1454, 4607, 1456, 1457, 1479, 1458, 1461, 1466,
-     1462, 1463, 1470, 1475, 1472, 1497, 1489, 1494, 1492, 1499,
-     1501, 1502, 1505, 1508, 1509, 1517, 1474, 1518, 1519, 1471,
+     1314, 1288, 1324, 1329, 1333, 1334, 1315, 1341, 1339, 1343,
+     1345, 1347, 1336, 1351, 1352, 1353, 1355, 1354, 1357, 1360,
+     1363, 1361, 1359, 1364, 1366, 4693, 1367, 1382, 1384, 1380,
+     1381, 1385, 1386, 1388, 1390, 1389, 1391, 1398, 1392, 1399,
+     1408, 1400, 4693, 1403, 1404, 1411, 1415, 1409, 1416, 1418,
+     1405, 1421, 1422, 1425, 4693, 1427, 1432, 1426, 1434, 1435,
+     1437, 1117, 1438, 1440, 1441, 1442, 1443, 1444, 1451, 1450,
+     1448, 1466, 1452, 1455, 1467, 1459, 1474, 1471, 1470, 1473,
+     1476, 1477, 1482, 1484, 1487, 1486, 1488, 1497, 1480, 1495,
+     1492, 1502, 1506, 1496, 1499, 1508, 1509, 4693, 1512, 1515,
 
-     1523, 1510, 1521, 1529, 1531, 1532, 1534, 1493, 1535, 1542,
-     1539, 4607, 1550, 1546, 1537, 1547, 1557, 1553, 1552, 1555,
-     1559, 1561, 1569, 1565, 1562, 1567, 1566, 1570, 1573, 1576,
-     1578, 1588, 4607, 1575, 1579, 1583, 1580, 1591, 1592, 1594,
-     1600, 1602, 1610, 1605, 4607, 1590, 1613, 1615, 1608, 1614,
-     1617, 1620, 1627, 1622, 1623, 1624, 1625, 1629, 1631, 1633,
-     1636, 1632, 4607, 1640, 1639, 1643, 1651, 1648, 1652, 1653,
-     1654, 1658, 1659, 1660, 1667, 1663, 1664, 4607, 1662, 1671,
-     1665, 1666, 1675, 1688, 1689, 1678, 1681, 1691, 1685, 1692,
-     1695, 1698, 1696, 1699, 1697, 1700, 4607, 1701,  143, 1703,
+     4693, 1514, 1516, 1538, 1517, 1519, 1520, 1521, 1522, 1524,
+     1525, 1531, 1533, 1542, 1540, 1548, 1550, 1552, 1553, 1551,
+     1560, 1558, 1568, 1570, 1566, 1571, 1573, 1575, 1577, 1579,
+     1578, 1585, 1586, 1588, 1595, 1582, 1580, 1598, 1605, 1602,
+     4693, 1613, 1608, 1600, 1609, 1616, 1615, 1612, 1614, 1618,
+     1621, 1630, 1625, 1626, 1628, 1629, 1632, 1635, 1638, 1639,
+     1642, 4693, 1640, 1641, 1643, 1644, 1651, 1652, 1653, 1662,
+     1663, 1672, 1665, 4693, 1667, 1674, 1675, 1677, 1670, 1669,
+     1681, 1688, 1685, 1687, 1686, 1692, 1693, 1694, 1695, 1699,
+     1691, 4693, 1702, 1701, 1706, 1714, 1709, 1711, 1716, 1715,
 
-     1709, 1702, 1711, 1718, 1710, 1719, 1723, 1713, 1726, 1729,
-     1730, 1731, 1732, 1733, 1735, 1737, 1738, 1741, 1743, 1742,
-     1751, 4607, 1746, 1753, 1757, 1755, 1760, 1761, 1766, 1768,
-     1771, 1772, 1774, 4607, 1781, 1778, 1776, 1783, 1784, 1786,
-     1787, 1788, 1789, 1791, 1792, 1796, 1799, 1795, 1797, 1804,
-     4607, 1811, 1806, 1816, 1807, 1818, 1809, 1831, 1819, 1822,
-     1826, 1828, 1840, 1833, 1832, 1843, 1834, 1842, 1851, 1850,
-     1852, 1861, 1844, 1856, 1866, 1854, 1858, 1873, 1875, 1872,
-     1870, 1878, 1879, 1883, 1882, 4607, 1884, 1885, 1886, 1890,
-     1903, 1891, 1901, 1889, 1906, 1895, 1907, 1911, 1913, 1915,
+     1720, 1721, 1722, 1730, 1723, 1726, 4693, 1725, 1734, 1727,
+     1732, 1736, 1746, 1751, 1742, 1744, 1753, 1747, 1754, 1755,
+     1760, 1758, 1761, 1759, 1762, 4693, 1763, 1765,  145, 1769,
+     1771, 1773, 1774, 1781, 1785, 1784, 1788, 1791, 1792, 1793,
+     1795, 1797, 1780, 1798, 1801, 1802, 1804, 1808, 1809, 1811,
+     1810, 1815, 4693, 1813, 1818, 1819, 1824, 1825, 1832, 1833,
+     1835, 1836, 1839, 1837, 4693, 1846, 1841, 1843, 1847, 1849,
+     1852, 1853, 1854, 1857, 1859, 1860, 1862, 1863, 1868, 1865,
+     1866, 1870, 1873, 4693, 1884, 1875, 1877, 1876, 1887, 1888,
+     1899, 1891, 1894, 1901, 1902, 1915, 1904, 1897, 1911, 1912,
 
-     1916, 1918, 1920, 1917, 1927, 4607, 1921, 1929, 1928, 1931,
-     1935, 1937, 1938, 1939, 1945, 1942, 1946, 1940, 1949, 1952,
-     1958, 1950, 1961, 1956, 1953, 4607, 1970, 1971, 1969, 1978,
-     1973, 1975, 1976, 1980, 1977, 1981, 1983, 1990, 1985, 1988,
-     1986, 1989, 1991, 1992, 1995, 1996, 2000, 2002, 2011, 2004,
-     2012, 4607, 2013, 2020, 2016, 2022, 2023, 2024, 2026, 2028,
-     2029, 2034, 2046, 2038, 2043, 2045, 2035, 2047, 2050, 2049,
-     2051, 4607, 2052, 2057, 2053, 2058, 2059, 2062, 2063, 2060,
-     2069, 2076, 2080, 2066, 2081, 2086, 2082, 2088, 2068, 2091,
-     2098, 2099, 2100, 2102, 4607, 2105, 2106, 2107, 2095, 2108,
+     1916, 1909, 1922, 1925, 1931, 1919, 1926, 1936, 1929, 1933,
+     1946, 1948, 1944, 1950, 1947, 1952, 1957, 1958, 4693, 1960,
+     1959, 1962, 1966, 1977, 1968, 1970, 1972, 1937, 1973, 1978,
+     1981, 1984, 1985, 1986, 1989, 1997, 1990, 1999, 4693, 2001,
+     2002, 2000, 2009, 1992, 2014, 2010, 2006, 2017, 2018, 2020,
+     2021, 2023, 2026, 2032, 2022, 2024, 2034, 2035, 4693, 2042,
+     2043, 2039, 2051, 2046, 2047, 2049, 2053, 2050, 4693, 2054,
+     2056, 4693, 2063, 2058, 2061, 1895, 2059, 2062, 2064, 2067,
+     2068, 2071, 2077, 2076, 2069, 2083, 4693, 2084, 2091, 2086,
+     2094, 2096, 2097, 2098, 2099, 2106, 2100, 2111, 2115, 2109,
 
-     2109, 2111, 2114, 2112, 2117, 2121, 2119, 2120, 2129, 2136,
-     2127, 2131, 2134, 2137, 2144, 2140, 2141, 2142, 2149, 2145,
-     2146, 2151, 2152, 2154, 2155, 2157, 2158, 2174, 2161, 2163,
-     2175, 2178, 2179, 2181, 2183, 2185, 4607, 2169, 2184, 2194,
-     2197, 2195, 2201, 2186, 2198, 2188, 2209, 2211, 4607, 2207,
-     4607, 2212, 2213, 2221, 4607, 2219, 4607, 2223, 2220, 4607,
-     2224, 2228, 2226, 2230, 2231, 2233, 2234, 2235, 2238, 2240,
-     2242, 2245, 2243, 2248, 2249, 2251, 2252, 4607, 2261, 2254,
-     2263, 2266, 2264, 2256, 2258, 2271, 2268, 2274, 2279, 2282,
-     2289, 2275, 2290, 4607, 2285, 2292, 2286, 2296, 4607, 2288,
+     2117, 2101, 2121, 2118, 2122, 2124, 4693, 2125, 2128, 2126,
+     2131, 2132, 2133, 2134, 2135, 2137, 2138, 2141, 2147, 2153,
+     2142, 2155, 2161, 2156, 2159, 2163, 2167, 2174, 2175, 2176,
+     2178, 4693, 2181, 2166, 2173, 2183, 2185, 2187, 2186, 2188,
+     2190, 2192, 2191, 2194, 2195, 2204, 2212, 2197, 2205, 2207,
+     2209, 2219, 2215, 2216, 2221, 2229, 2218, 2220, 2225, 2230,
+     2222, 2231, 2232, 2233, 2240, 2238, 2246, 2248, 2251, 2254,
+     2256, 2257, 2258, 4693, 2242, 2259, 2269, 2261, 2272, 2274,
+     2263, 2271, 2273, 2285, 2281, 4693, 2282, 4693, 2286, 2287,
+     2290, 4693, 2295, 4693, 2297, 2292, 4693, 2298, 2302, 2299,
 
-     2297, 2300, 2293, 2303, 2304, 2306, 2310, 2308, 2313, 2322,
-     2323, 2324, 2318, 2326, 2314, 2332, 2336, 2315, 2334, 2337,
-     2338, 2347, 2343, 2350, 2342, 2346, 2354, 2355, 2345, 2349,
-     2357, 2359, 2361, 2362, 2366, 2370, 2367, 2368, 2371, 2372,
-     4607, 2381, 2376, 2378, 2389, 2382, 2384, 2386, 2391, 2392,
-     2399, 2395, 2394, 2400, 4607, 2404, 4607, 2405, 2408, 2412,
-     2415, 2413, 2417, 2420, 2425, 2421, 2426, 2428, 2429, 2442,
-     2427, 2431, 2433, 2439, 2443, 2445, 4607, 2446, 2448, 2449,
-     2452, 2454, 2455, 2461, 2458, 2456, 2478, 4607, 2475, 2464,
-     2480, 2487, 2483, 2490, 2485, 4607, 2473, 2492, 2489, 2494,
+     2304, 2305, 2307, 2310, 2309, 2312, 2313, 2316, 2318, 2320,
+     2322, 2323, 2325, 2326, 4693, 2335, 2328, 2337, 2338, 2340,
+     2330, 2332, 2347, 2343, 2341, 2353, 2349, 2363, 2358, 2365,
+     4693, 2360, 2367, 2362, 2364, 4693, 2368, 2371, 2375, 2369,
+     2373, 2379, 2377, 2384, 2386, 2382, 2387, 2395, 2396, 2388,
+     2399, 2400, 2403, 2413, 2408, 2410, 2411, 2412, 2414, 2416,
+     2423, 2421, 2428, 2418, 2427, 2420, 2429, 2431, 2435, 2437,
+     2438, 2439, 2442, 2443, 2446, 2444, 2445, 2447, 2448, 4693,
+     2451, 2458, 2462, 2459, 2466, 2463, 2468, 2470, 2471, 2472,
+     2475, 2474, 2473, 4693, 2476, 4693, 2479, 2485, 2494, 2495,
 
-     4607, 4607, 2495, 2496, 2498, 2499, 2500, 2505, 2507, 2506,
-     2508, 4607, 2510, 2512, 2516, 2523, 2524, 2525, 2527, 2515,
-     4607, 2531, 2534, 2521, 2537, 2539, 2540, 2541, 2542, 2549,
-     2545, 2547, 2548, 2556, 2550, 2559, 4607, 2561, 2563, 2568,
-     2564, 2569, 2570, 2574, 2575, 2577, 2578, 2579, 2580, 2581,
-     2583, 2582, 2590, 2585, 2586, 2592, 2606, 2588, 2602, 2603,
-     2608, 2604, 2611, 2613, 2615, 2616, 2625, 2626, 4607, 2628,
-     2617, 2633, 2618, 2636, 2631, 2637, 2646, 2641, 2632, 2642,
-     2650, 2645, 4607, 2657, 2647, 2664, 2648, 2658, 2669, 2667,
-     2668, 2649, 2672, 2674, 2677, 2675, 2679, 2680, 2683, 4607,
+     2490, 2497, 2499, 2501, 2500, 2505, 2503, 2513, 2521, 2506,
+     2511, 2516, 2508, 2523, 2518, 4693, 2525, 2527, 2528, 2531,
+     2532, 2533, 2536, 2540, 2535, 2560, 4693, 2548, 2543, 2556,
+     2563, 2562, 2564, 2565, 4693, 2546, 2574, 2569, 2570, 4693,
+     4693, 2572, 2575, 2576, 2577, 2578, 2580, 2587, 2584, 2585,
+     4693, 2599, 2586, 2588, 2596, 2602, 2604, 2605, 2590, 4693,
+     2608, 2611, 2612, 2615, 2616, 2617, 2618, 2619, 2627, 2620,
+     2624, 2625, 2634, 2635, 2641, 4693, 2643, 2636, 2647, 2644,
+     2649, 2650, 2652, 2654, 2655, 2657, 2658, 2659, 2662, 2664,
+     2660, 2661, 2666, 2667, 2678, 2687, 2669, 2680, 2671, 2684,
 
-     4607, 2684, 2685, 2687, 2689, 2690, 2694, 2691, 2698, 2692,
-     2696, 4607, 2702, 2711, 2708, 2709, 2719, 2720, 2722, 2710,
-     2723, 2724, 2726, 2725, 2727, 2729, 2731, 2733, 2735, 2736,
-     4607, 2739, 2738, 4607, 2741, 2742, 2743, 2752, 2755, 2748,
-     2763, 2751, 2765, 2766, 2773, 2769, 2776, 2777, 2780, 2778,
-     2781, 2788, 4607, 2783, 2785, 2784, 2787, 2797, 2792, 2800,
-     2790, 4607, 2798, 2805, 2808, 2810, 2799, 2817, 2815, 2813,
-     2816, 2820, 4607, 2823, 4607, 2824, 2825, 4607, 2826, 2830,
-     2831, 2833, 2834, 2835, 2839, 2846, 2841, 2847, 2848, 2849,
-     2850, 2852, 2859, 2851, 4607, 2862, 2855, 2858, 2860, 4607,
+     2689, 2693, 2694, 2696, 2697, 2701, 2698, 2709, 2704, 4693,
+     2711, 2706, 2716, 2708, 2712, 2720, 2721, 2723, 2713, 2728,
+     2729, 2736, 2731, 4693, 2740, 2738, 2735, 2742, 2741, 2750,
+     2745, 2743, 2746, 2758, 2747, 2759, 2755, 2761, 2764, 2769,
+     4693, 4693, 2762, 2766, 2777, 2770, 2772, 2780, 2774, 2781,
+     2778, 2786, 4693, 2788, 2790, 2791, 2792, 2801, 2803, 2806,
+     2807, 2808, 2794, 2796, 2798, 2813, 2809, 2818, 2819, 2821,
+     2822, 4693, 2824, 2823, 4693, 2828, 2825, 2831, 2830, 2833,
+     2834, 2841, 2835, 2846, 2848, 2855, 2852, 2859, 2863, 2867,
+     2854, 2862, 2870, 4693, 2865, 2869, 2866, 2871, 2881, 2872,
 
-     2871, 4607, 2864, 4607, 2872, 2875, 2882, 2877, 2878, 2881,
-     2885, 2888, 4607, 2886, 2890, 2891, 2895, 2897, 2899, 2900,
-     2901, 2898, 2902, 2903, 4607, 2905, 2907, 2915, 2908, 2916,
-     2920, 2927, 2921, 4607, 2928, 2929, 2930, 2934, 2935, 4607,
-     2937, 2938, 4607, 2943, 2945, 2947, 2949, 2950, 2951, 2953,
-     2959, 2955, 2966, 2962, 2961, 2963, 4607, 2964, 2965, 2969,
-     2980, 2970, 2972, 2982, 2984, 2986, 2978, 2993, 2995, 2991,
-     2997, 2987, 3002, 2998, 3004, 4607, 3005, 3006, 4607, 3009,
-     3012, 3013, 3014, 4607, 3015, 4607, 3017, 3018, 3020, 3019,
-     3024, 3026, 3027, 3029, 3037, 3038, 3040, 3039, 3049, 3046,
+     2882, 2879, 4693, 2883, 2884, 2888, 2890, 2892, 2899, 2895,
+     2897, 2898, 2900, 4693, 2903, 4693, 2907, 2905, 4693, 2906,
+     2911, 2914, 2916, 2913, 2920, 2921, 2928, 2924, 2929, 2930,
+     2931, 2932, 2934, 2941, 2933, 4693, 2942, 2937, 2940, 2951,
+     2945, 4693, 4693, 2953, 4693, 2946, 4693, 2956, 2959, 2963,
+     2961, 2964, 2966, 2970, 2967, 4693, 2972, 2974, 2976, 2980,
+     2981, 2983, 2984, 2985, 2982, 2986, 2987, 4693, 2990, 2988,
+     2992, 2998, 2999, 3004, 3009, 3003, 4693, 3012, 3011, 3015,
+     3020, 3021, 4693, 3018, 3022, 4693, 3026, 3030, 3005, 3032,
+     3034, 3038, 3039, 3035, 3041, 3048, 3045, 3046, 3047, 4693,
 
-     3047, 4607, 4607, 3051, 3057, 3053, 3060, 3063, 3061, 3066,
-     3071, 3069, 3076, 3077, 3085, 4607, 3086, 3068, 3087, 4607,
-     3055, 3089, 3070, 3081, 3092, 3095, 3098, 3100, 3101, 3102,
-     3103, 3078, 3106, 4607, 3107, 3109, 3110, 3111, 3112, 3115,
-     3116, 4607, 3120, 3119, 3121, 3123, 3128, 3131, 3138, 3141,
-     3146, 3143, 3147, 3148, 3150, 3152, 3156, 4607, 3163, 3153,
-     3154, 3155, 3165, 3170, 3157, 3172, 3166, 3178, 3180, 3175,
-     3181, 4607, 3182, 3186, 3183, 3191, 3188, 3192, 3193, 3194,
-     3204, 3197, 3199, 3201, 3208, 4607, 3205, 3209, 3211, 3213,
-     3219, 3212, 3222, 3215, 3122, 3223, 3227, 3224, 3234, 4607,
+     3049, 3051, 3057, 3062, 3052, 3054, 3064, 3066, 3070, 3069,
+     3075, 3077, 3073, 3084, 3079, 3088, 3080, 3083, 4693, 3091,
+     3092, 4693, 3090, 3093, 3094, 3098, 4693, 3099, 4693, 3101,
+     3102, 3104, 3106, 3108, 3110, 3111, 3116, 3121, 3122, 3123,
+     3124, 3133, 3130, 3129, 4693, 4693, 3135, 3141, 3136, 3144,
+     3146, 3139, 3148, 3158, 3150, 3154, 3157, 3165, 4693, 3160,
+     3161, 3168, 4693, 3163, 3169, 3170, 3171, 3173, 3176, 3175,
+     3180, 3183, 3177, 3184, 3182, 3185, 3196, 4693, 3190, 3197,
+     3198, 3199, 3200, 3201, 3202, 4693, 3210, 3206, 3211, 3203,
+     3212, 3215, 3229, 3232, 3234, 3224, 3227, 3235, 3237, 3242,
 
-     3229, 3237, 3230, 3238, 3239, 3240, 3243, 3244, 3247, 3252,
-     3253, 3254, 3250, 3271, 3266, 4607, 3257, 4607, 3258, 3268,
-     3278, 3273, 3275, 4607, 3276, 3279, 4607, 3280, 3283, 3281,
-     3286, 4607, 3284, 3285, 3289, 3293, 3301, 4607, 3303, 3304,
-     3306, 3314, 3316, 3313, 3315, 3317, 3319, 3320, 3321, 3322,
-     4607, 3324, 3327, 3326, 3332, 3333, 3335, 3336, 3338, 3339,
-     3341, 3349, 3345, 3344, 4607, 3347, 3352, 3354, 3356, 3358,
-     4607, 4607, 3361, 3365, 3367, 3368, 3371, 4607, 3369, 3380,
-     3376, 3378, 3381, 4607, 4607, 3383, 4607, 3379, 4607, 4607,
-     3384, 3386, 3393, 4607, 3396, 4607, 3404, 3399, 3385, 3387,
+     3238, 4693, 3245, 3244, 3247, 3207, 3252, 3254, 3255, 3257,
+     3248, 3259, 3261, 3262, 3263, 4693, 3265, 3269, 3271, 3273,
+     3275, 3277, 3278, 3279, 3285, 3286, 3287, 3288, 3292, 4693,
+     3289, 3294, 3296, 3297, 3299, 3300, 3304, 3306, 3308, 3310,
+     3312, 3314, 3316, 4693, 3320, 3322, 3321, 3324, 3328, 3325,
+     3329, 3333, 3331, 3335, 3338, 3341, 3339, 3351, 3352, 4693,
+     3342, 4693, 3354, 3357, 3361, 3359, 3364, 4693, 3365, 3366,
+     4693, 3367, 3369, 3372, 3370, 4693, 3371, 3373, 3376, 3377,
+     3391, 4693, 3393, 3394, 3383, 3401, 3404, 3400, 3402, 3405,
+     3403, 3407, 3408, 3409, 4693, 3413, 3411, 3419, 3420, 3412,
 
-     3402, 4607, 3403, 3405, 3411, 4607, 3406, 3414, 3412, 3413,
-     4607, 3419, 4607, 3420, 3424, 3426, 3425, 3429, 3432, 3433,
-     3435, 3437, 3440, 3441, 3442, 3444, 3447, 3449, 3448, 3450,
-     3451, 3452, 3454, 3464, 3456, 3458, 3466, 3467, 3468, 3469,
-     3472, 3470, 3475, 3476, 3477, 3478, 3482, 3485, 3489, 3488,
-     3502, 3503, 4607, 4607, 3505, 3491, 3497, 3495, 4607, 3499,
-     3507, 3510, 3511, 3512, 3513, 3516, 3517, 4607, 3523, 3515,
-     3520, 3528, 3526, 3527, 3529, 3530, 3536, 3540, 3543, 3550,
-     3548, 3537, 3549, 3551, 3553, 3554, 3557, 3558, 3564, 3559,
-     3570, 4607, 3565, 4607, 3567, 3571, 3575, 4607, 4607, 3572,
+     4693, 3422, 3423, 3424, 3426, 3429, 3436, 3433, 3431, 4693,
+     3435, 3438, 3447, 3440, 3450, 4693, 4693, 3444, 3453, 3456,
+     3445, 3460, 4693, 3462, 3463, 3455, 3465, 3468, 4693, 4693,
+     3470, 4693, 3472, 4693, 4693, 3473, 3474, 3476, 4693, 3481,
+     4693, 3488, 3483, 3485, 3486, 3487, 4693, 3491, 3493, 3495,
+     4693, 3489, 3502, 3497, 3499, 4693, 3504, 4693, 3506, 3512,
+     3513, 3517, 3509, 3516, 3520, 3522, 3527, 3529, 3524, 3531,
+     3532, 3534, 3535, 3537, 3538, 3539, 3540, 3541, 3543, 3548,
+     3551, 3552, 3553, 3554, 3555, 3562, 3556, 3558, 3560, 3564,
+     3567, 3571, 3568, 3574, 3581, 3584, 3588, 4693, 4693, 3590,
 
-     3577, 3579, 3581, 3582, 3586, 3583, 4607, 3588, 3589, 3598,
-     3595, 4607, 3602, 4607, 3605, 3590, 3607, 3610, 3612, 4607,
-     4607, 4607, 3613, 3599, 3616, 3617, 3618, 3619, 3620, 3622,
-     3624, 3627, 4607, 3631, 3632, 3634, 3636, 3641, 3645, 3642,
-     3647, 3654, 3650, 3656, 3638, 3658, 3660, 3662, 4607, 4607,
-     3664, 3665, 3672, 3669, 3670, 3673, 3676, 3678, 3679, 3681,
-     3682, 3684, 3685, 4607, 3691, 3687, 3686, 3693, 3698, 3699,
-     3700, 3702, 4607, 4607, 3695, 3703, 3705, 3710, 3712, 3713,
-     3715, 3717, 3718, 4607, 3719, 4607, 3720, 3721, 3732, 3728,
-     3733, 3738, 4607, 3735, 3729, 4607, 3745, 3736, 3739, 4607,
+     3575, 3586, 3592, 4693, 3594, 3595, 3596, 3599, 3598, 3600,
+     3603, 3601, 4693, 3605, 3606, 3608, 3609, 3610, 3612, 3617,
+     3622, 3623, 3628, 3632, 3639, 3629, 3634, 3624, 3636, 3637,
+     3640, 3645, 3644, 3652, 3653, 3659, 4693, 3648, 4693, 3654,
+     3656, 3661, 4693, 4693, 3662, 3665, 3670, 3664, 3666, 3672,
+     3673, 4693, 3674, 3681, 3687, 3675, 4693, 3691, 4693, 3693,
+     3678, 3695, 3696, 3699, 4693, 4693, 4693, 3702, 3683, 3700,
+     3706, 3704, 3707, 3711, 3710, 3708, 3712, 4693, 3714, 3717,
+     3719, 3723, 3726, 3731, 3728, 3732, 3739, 3736, 3742, 3734,
+     3740, 3747, 3751, 4693, 4693, 3744, 3752, 3754, 3756, 3758,
 
-     3746, 4607, 4607, 3752, 4607, 3748, 4607, 3753, 3755, 3758,
-     3759, 3761, 3763, 3766, 3767, 3770, 3771, 3772, 3780, 3776,
-     3777, 4607, 4607, 3784, 3779, 3785, 3793, 3788, 3790, 3796,
-     4607, 4607, 3792, 3798, 3800, 4607, 3799, 3801, 3805, 3807,
-     3808, 3809, 3811, 3815, 3816, 3810, 3817, 3819, 3827, 3830,
-     3821, 3833, 3832, 3834, 3839, 3841, 3842, 4607, 3844, 3846,
-     3840, 4607, 3851, 3847, 3856, 3859, 3857, 4607, 3845, 3868,
-     3865, 3870, 3871, 3878, 3874, 3873, 4607, 3876, 3880, 3881,
-     4607, 3883, 4607, 3884, 4607, 3885, 4607, 3890, 3891, 3888,
-     4607, 3894, 3900, 4607, 3903, 3898, 3905, 3909, 3910, 4607,
+     3765, 3760, 3762, 3766, 3768, 3769, 3771, 3770, 4693, 3778,
+     3774, 3772, 3773, 3780, 3784, 3787, 3785, 4693, 4693, 3791,
+     3792, 3795, 3797, 3798, 3799, 3800, 3802, 3803, 4693, 3804,
+     4693, 3805, 3807, 3824, 3821, 3823, 3827, 4693, 3826, 3816,
+     4693, 3809, 3828, 3830, 4693, 3833, 4693, 4693, 3837, 4693,
+     3838, 4693, 3839, 3840, 3844, 3846, 3848, 3850, 3853, 3854,
+     3856, 3857, 3860, 3867, 3863, 3864, 4693, 4693, 3871, 3866,
+     3872, 3879, 3876, 3877, 3883, 4693, 4693, 3880, 3884, 3887,
+     4693, 3886, 3888, 3895, 3893, 3896, 3897, 3894, 3900, 3902,
+     3907, 3903, 3904, 3909, 3918, 3916, 3920, 3906, 3923, 3924,
 
-     3917, 3913, 3914, 3921, 3912, 3916, 3922, 3923, 3932, 3924,
-     3934, 4607, 3929, 3931, 3936, 3938, 3939, 3944, 3940, 3942,
-     3947, 3945, 3952, 3958, 3954, 4607, 3960, 3963, 4607, 3964,
-     4607, 3966, 3967, 3969, 4607, 3971, 3968, 3972, 3975, 4607,
-     3976, 3979, 4607, 3980, 3982, 3987, 3989, 3984, 3990, 3991,
-     3992, 3997, 4005, 3999, 4607, 4001, 4006, 4016, 4015, 4017,
-     4024, 4007, 4607, 4022, 4023, 4011, 4035, 4019, 4032, 4607,
-     4034, 4021, 4607, 4039, 4041, 4042, 4043, 4045, 4050, 4052,
-     4053, 4607, 4055, 4607, 4607, 4047, 4607, 4057, 4059, 4607,
-     4062, 4063, 4064, 4065, 4068, 4070, 4607, 4607, 4069, 4078,
+     3927, 3928, 4693, 3930, 3931, 3935, 4693, 3937, 3938, 3940,
+     3941, 3942, 4693, 3943, 3955, 3952, 3950, 3957, 3964, 3960,
+     3962, 4693, 3966, 3967, 3968, 4693, 3944, 4693, 3970, 4693,
+     3974, 4693, 3978, 3984, 3977, 4693, 3987, 3989, 4693, 3997,
+     3979, 3981, 3975, 3998, 4693, 4005, 4002, 4004, 4011, 4000,
+     3991, 4008, 4006, 4020, 4015, 4017, 4693, 4019, 4021, 4023,
+     4026, 4025, 4028, 4027, 4030, 4033, 4042, 4031, 4035, 4032,
+     4693, 4045, 4053, 4693, 4046, 4693, 4055, 4048, 4056, 4693,
+     4059, 4050, 4060, 4062, 4693, 4065, 4063, 4693, 4068, 4072,
+     4074, 4069, 4075, 4079, 4076, 4080, 4085, 4086, 4091, 4693,
 
-     4073, 4086, 4071, 4607, 4080, 4082, 4087, 4089, 4088, 4607,
-     4090, 4091, 4093, 4095, 4096, 4103, 4099, 4097, 4104, 4607,
-     4607, 4105, 4607, 4107, 4112, 4120, 4607, 4607, 4607, 4122,
-     4607, 4127, 4131, 4130, 4607, 4133, 4123, 4135, 4607, 4137,
-     4138, 4139, 4140, 4607, 4142, 4144, 4146, 4151, 4157, 4148,
-     4154, 4152, 4168, 4171, 4158, 4166, 4169, 4170, 4172, 4173,
-     4179, 4607, 4607, 4185, 4607, 4607, 4187, 4189, 4194, 4607,
-     4182, 4196, 4607, 4198, 4199, 4200, 4201, 4203, 4205, 4607,
-     4607, 4206, 4207, 4208, 4215, 4209, 4607, 4217, 4180, 4211,
-     4221, 4213, 4219, 4222, 4607, 4607, 4607, 4607, 4607, 4228,
+     4082, 4087, 4099, 4097, 4101, 4108, 4103, 4693, 4105, 4106,
+     4109, 4118, 4113, 4115, 4693, 4117, 4119, 4693, 4123, 4120,
+     4126, 4124, 4133, 4135, 4137, 4139, 4693, 4142, 4693, 4693,
+     4127, 4693, 4143, 4147, 4693, 4150, 4145, 4151, 4152, 4154,
+     4155, 4693, 4693, 4156, 4163, 4158, 4168, 4164, 4693, 4162,
+     4172, 4173, 4174, 4175, 4693, 4176, 4177, 4179, 4180, 4183,
+     4187, 4188, 4189, 4185, 4693, 4693, 4191, 4693, 4194, 4198,
+     4204, 4693, 4693, 4693, 4213, 4693, 4215, 4219, 4218, 4693,
+     4221, 4207, 4195, 4693, 4224, 4226, 4227, 4228, 4693, 4229,
+     4230, 4234, 4237, 4241, 4238, 4244, 4242, 4256, 4252, 4232,
 
-     4607, 4607, 4223, 4229, 4230, 4235, 4607, 4236, 4240, 4239,
-     4241, 4242, 4247, 4245, 4252, 4254, 4253, 4255, 4260, 4256,
-     4263, 4262, 4264, 4266, 4267, 4279, 4282, 4270, 4274, 4283,
-     4285, 4287, 4284, 4288, 4297, 4293, 4296, 4298, 4607, 4299,
-     4607, 4300, 4607, 4607, 4302, 4304, 4308, 4306, 4319, 4321,
-     4310, 4320, 4311, 4607, 4312, 4322, 4323, 4607, 4326, 4329,
-     4328, 4331, 4335, 4337, 4338, 4340, 4339, 4341, 4350, 4353,
-     4361, 4351, 4354, 4362, 4363, 4364, 4371, 4369, 4373, 4607,
-     4366, 4375, 4377, 4376, 4378, 4385, 4380, 4387, 4381, 4607,
-     4389, 4392, 4386, 4390, 4393, 4398, 4402, 4405, 4406, 4607,
+     4245, 4248, 4258, 4259, 4261, 4266, 4693, 4693, 4268, 4693,
+     4693, 4271, 4273, 4275, 4693, 4276, 4278, 4693, 4282, 4279,
+     4283, 4286, 4284, 4289, 4693, 4693, 4290, 4293, 4291, 4297,
+     4292, 4693, 4300, 4307, 4302, 4304, 4305, 4311, 4306, 4693,
+     4693, 4693, 4693, 4693, 4312, 4693, 4693, 4313, 4314, 4319,
+     4320, 4693, 4321, 4326, 4323, 4325, 4330, 4331, 4333, 4335,
+     4338, 4341, 4340, 4343, 4342, 4347, 4349, 4350, 4352, 4363,
+     4367, 4369, 4353, 4355, 4370, 4371, 4374, 4360, 4377, 4384,
+     4380, 4382, 4383, 4693, 4386, 4693, 4387, 4693, 4693, 4389,
+     4390, 4395, 4393, 4404, 4406, 4396, 4407, 4397, 4693, 4399,
 
-     4396, 4407, 4413, 4414, 4416, 4418, 4420, 4421, 4425, 4426,
-     4428, 4434, 4429, 4435, 4437, 4438, 4439, 4607, 4445, 4441,
-     4607, 4446, 4447, 4448, 4449, 4453, 4607, 4462, 4450, 4455,
-     4463, 4466, 4470, 4607, 4472, 4476, 4473, 4607, 4478, 4607,
-     4607, 4479, 4481, 4482, 4486, 4488, 4607, 4607, 4607, 4515,
-     4522, 4529, 4536, 4543,   70, 4550, 4557, 4564, 4571, 4578,
-     4585, 4592, 4599
+     4408, 4409, 4693, 4411, 4418, 4414, 4415, 4417, 4421, 4424,
+     4427, 4425, 4426, 4435, 4436, 4444, 4446, 4437, 4448, 4449,
+     4439, 4456, 4452, 4460, 4693, 4451, 4461, 4462, 4463, 4464,
+     4471, 4466, 4468, 4472, 4693, 4475, 4467, 4484, 4477, 4478,
+     4486, 4487, 4490, 4491, 4693, 4492, 4493, 4498, 4500, 4502,
+     4505, 4506, 4507, 4509, 4511, 4512, 4520, 4515, 4521, 4523,
+     4524, 4525, 4693, 4531, 4527, 4693, 4532, 4533, 4534, 4535,
+     4539, 4693, 4548, 4536, 4541, 4549, 4552, 4556, 4693, 4558,
+     4562, 4559, 4693, 4564, 4693, 4693, 4565, 4567, 4568, 4572,
+     4574, 4693, 4693, 4693, 4601, 4608, 4615, 4622, 4629,   70,
+
+     4636, 4643, 4650, 4657, 4664, 4671, 4678, 4685
     } ;
 
-static yyconst flex_int16_t yy_def[2364] =
+static yyconst flex_int16_t yy_def[2409] =
     {   0,
-     2349,    1, 2350, 2350, 2351, 2351, 2352, 2352, 2353, 2353,
-     2354, 2354, 2349, 2355, 2349, 2349, 2349, 2349, 2356, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2357, 2349, 2349, 2349, 2357, 2358, 2349, 2349, 2349,
-     2358, 2359, 2349, 2349, 2349, 2349, 2359, 2360, 2349, 2349,
-     2349, 2360, 2361, 2349, 2362, 2349, 2361, 2361, 2355, 2355,
-     2349, 2363, 2356, 2363, 2356, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
+     2394,    1, 2395, 2395, 2396, 2396, 2397, 2397, 2398, 2398,
+     2399, 2399, 2394, 2400, 2394, 2394, 2394, 2394, 2401, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2402, 2394, 2394, 2394, 2402, 2403, 2394, 2394,
+     2394, 2403, 2404, 2394, 2394, 2394, 2394, 2404, 2405, 2394,
+     2394, 2394, 2405, 2406, 2394, 2407, 2394, 2406, 2406, 2400,
+     2400, 2394, 2408, 2401, 2408, 2401, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
 
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2357, 2357, 2358, 2358, 2359, 2359, 2349,
-     2360, 2360, 2361, 2361, 2362, 2362, 2361, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2402, 2402, 2403, 2403,
+     2404, 2404, 2394, 2405, 2405, 2406, 2406, 2407, 2407, 2406,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
 
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2361, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2406, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
 
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2361, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349,
-     2355, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2406, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400,
+     2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
 
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349,
-     2361, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2394, 2400, 2406, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
 
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2361,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2349, 2355, 2349, 2349, 2355, 2349, 2349, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2406, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2394, 2400, 2394, 2394, 2400, 2394, 2394, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
 
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2361, 2355, 2355, 2355,
-     2349, 2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2406, 2400, 2400, 2400, 2400, 2394, 2400, 2400,
 
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2361, 2355,
+     2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
 
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
+     2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2394, 2400, 2400, 2406, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
 
-     2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400,
+     2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
 
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349, 2355,
-     2349, 2355, 2355, 2355, 2349, 2355, 2349, 2355, 2355, 2349,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2349, 2355, 2355, 2355, 2355, 2349, 2355,
+     2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2394, 2400, 2394, 2400, 2400,
+     2400, 2394, 2400, 2394, 2400, 2400, 2394, 2400, 2400, 2400,
 
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2349, 2355, 2349, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355, 2355,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2394, 2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2394, 2400, 2394, 2400, 2400, 2400, 2400,
 
-     2349, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2394,
+     2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
 
-     2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2349, 2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2349, 2355, 2349, 2355, 2355, 2349, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355, 2355, 2349,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2394, 2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2394, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400,
 
-     2355, 2349, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2349,
-     2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355, 2349, 2355,
-     2355, 2355, 2355, 2349, 2355, 2349, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
+     2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2394, 2400, 2394, 2400, 2400, 2394, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400,
+     2400, 2394, 2394, 2400, 2394, 2400, 2394, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400,
+     2400, 2400, 2394, 2400, 2400, 2394, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394,
 
-     2355, 2349, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355, 2349,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400,
+     2400, 2394, 2400, 2400, 2400, 2400, 2394, 2400, 2394, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2394, 2394, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400,
+     2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
 
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2349, 2355, 2349, 2355, 2355,
-     2355, 2355, 2355, 2349, 2355, 2355, 2349, 2355, 2355, 2355,
-     2355, 2349, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355,
-     2349, 2349, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355,
-     2355, 2355, 2355, 2349, 2349, 2355, 2349, 2355, 2349, 2349,
-     2355, 2355, 2355, 2349, 2355, 2349, 2355, 2355, 2355, 2355,
+     2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394,
+     2400, 2394, 2400, 2400, 2400, 2400, 2400, 2394, 2400, 2400,
+     2394, 2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400,
+     2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400,
 
-     2355, 2349, 2355, 2355, 2355, 2349, 2355, 2355, 2355, 2355,
-     2349, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2349, 2349, 2355, 2355, 2355, 2355, 2349, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2349, 2355, 2349, 2355, 2355, 2355, 2349, 2349, 2355,
+     2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394,
+     2400, 2400, 2400, 2400, 2400, 2394, 2394, 2400, 2400, 2400,
+     2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400, 2394, 2394,
+     2400, 2394, 2400, 2394, 2394, 2400, 2400, 2400, 2394, 2400,
+     2394, 2400, 2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400,
+     2394, 2400, 2400, 2400, 2400, 2394, 2400, 2394, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394, 2394, 2400,
 
-     2355, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355,
-     2355, 2349, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2349,
-     2349, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349, 2349,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2349, 2349, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2349, 2355, 2349, 2355, 2355, 2355, 2355,
-     2355, 2355, 2349, 2355, 2355, 2349, 2355, 2355, 2355, 2349,
+     2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400, 2394, 2400,
+     2400, 2400, 2394, 2394, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2394, 2400, 2400, 2400, 2400, 2394, 2400, 2394, 2400,
+     2400, 2400, 2400, 2400, 2394, 2394, 2394, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2394, 2394, 2400, 2400, 2400, 2400, 2400,
 
-     2355, 2349, 2349, 2355, 2349, 2355, 2349, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2349, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2349, 2349, 2355, 2355, 2355, 2349, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355,
-     2355, 2349, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355,
-     2349, 2355, 2349, 2355, 2349, 2355, 2349, 2355, 2355, 2355,
-     2349, 2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2349,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394, 2394, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400,
+     2394, 2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400, 2400,
+     2394, 2400, 2400, 2400, 2394, 2400, 2394, 2394, 2400, 2394,
+     2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2394, 2394, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2394, 2394, 2400, 2400, 2400,
+     2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
 
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355, 2349, 2355,
-     2349, 2355, 2355, 2355, 2349, 2355, 2355, 2355, 2355, 2349,
-     2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2349,
-     2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2349, 2355, 2349, 2349, 2355, 2349, 2355, 2355, 2349,
-     2355, 2355, 2355, 2355, 2355, 2355, 2349, 2349, 2355, 2355,
+     2400, 2400, 2394, 2400, 2400, 2400, 2394, 2400, 2400, 2400,
+     2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2394, 2400, 2400, 2400, 2394, 2400, 2394, 2400, 2394,
+     2400, 2394, 2400, 2400, 2400, 2394, 2400, 2400, 2394, 2400,
+     2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2394, 2400, 2400, 2394, 2400, 2394, 2400, 2400, 2400, 2394,
+     2400, 2400, 2400, 2400, 2394, 2400, 2400, 2394, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394,
 
-     2355, 2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2349,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349,
-     2349, 2355, 2349, 2355, 2355, 2355, 2349, 2349, 2349, 2355,
-     2349, 2355, 2355, 2355, 2349, 2355, 2355, 2355, 2349, 2355,
-     2355, 2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2349, 2349, 2355, 2349, 2349, 2355, 2355, 2355, 2349,
-     2355, 2355, 2349, 2355, 2355, 2355, 2355, 2355, 2355, 2349,
-     2349, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2349, 2349, 2349, 2349, 2349, 2355,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400, 2400,
+     2400, 2400, 2400, 2400, 2394, 2400, 2400, 2394, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400, 2394, 2394,
+     2400, 2394, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400,
+     2400, 2394, 2394, 2400, 2400, 2400, 2400, 2400, 2394, 2400,
+     2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2394, 2394, 2400, 2394, 2400, 2400,
+     2400, 2394, 2394, 2394, 2400, 2394, 2400, 2400, 2400, 2394,
+     2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2394, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
 
-     2349, 2349, 2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349, 2355,
-     2349, 2355, 2349, 2349, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2349, 2355, 2355, 2355, 2349, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349,
+     2400, 2400, 2400, 2400, 2400, 2400, 2394, 2394, 2400, 2394,
+     2394, 2400, 2400, 2400, 2394, 2400, 2400, 2394, 2400, 2400,
+     2400, 2400, 2400, 2400, 2394, 2394, 2400, 2400, 2400, 2400,
+     2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394,
+     2394, 2394, 2394, 2394, 2400, 2394, 2394, 2400, 2400, 2400,
+     2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2394, 2400, 2394, 2400, 2394, 2394, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400,
 
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355, 2355,
-     2355, 2355, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355,
-     2349, 2355, 2355, 2355, 2355, 2355, 2349, 2355, 2355, 2355,
-     2355, 2355, 2355, 2349, 2355, 2355, 2355, 2349, 2355, 2349,
-     2349, 2355, 2355, 2355, 2355, 2355, 2349, 2349,    0, 2349,
-     2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349,
-     2349, 2349, 2349
+     2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2394, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400, 2400,
+     2400, 2400, 2394, 2400, 2400, 2394, 2400, 2400, 2400, 2400,
+     2400, 2394, 2400, 2400, 2400, 2400, 2400, 2400, 2394, 2400,
+     2400, 2400, 2394, 2400, 2394, 2394, 2400, 2400, 2400, 2400,
+     2400, 2394, 2394,    0, 2394, 2394, 2394, 2394, 2394, 2394,
+
+     2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394
     } ;
 
-static yyconst flex_uint16_t yy_nxt[4648] =
+static yyconst flex_uint16_t yy_nxt[4734] =
     {   0,
        14,   15,   16,   17,   18,   19,   18,   14,   14,   14,
        14,   14,   18,   20,   21,   22,   23,   24,   25,   26,
        14,   27,   28,   29,   30,   31,   32,   33,   34,   35,
-       36,   37,   38,   39,   40,   41,   14,   14,   14,   14,
-       43,   44,   45,   43,   44,   45,   48,   49,   48,   49,
-       50,   46,   50,   69,   46,   69,   69,   51,   69,   51,
-       53,   54,   55,   56,   69,   18,   53,   54,   55,   56,
-       69,   18,   57,   59,   60,   61,   70,   79,   57,   59,
-       60,   61,   71,   70,   62,   70,   72,   89,   76,   77,
-       62,   15,   16,   17,   64,   65,   66,   74,  136,   74,
+       36,   37,   38,   39,   40,   41,   14,   14,   14,   42,
+       44,   45,   46,   44,   45,   46,   49,   50,   49,   50,
+       51,   47,   51,   70,   47,   70,   70,   52,   70,   52,
+       54,   55,   56,   57,   70,   18,   54,   55,   56,   57,
+       70,   18,   58,   60,   61,   62,   71,   80,   58,   60,
+       61,   62,   72,   71,   63,   71,   73,   90,   77,   78,
+       63,   15,   16,   17,   65,   66,   67,   75,  139,   75,
 
-       74,  136,   74,   67,   70,   91,   78,   90,   74,   75,
-       70,   70,   68,   15,   16,   17,   64,   65,   66,   92,
-       70,   80,   70,   93,   70,   67,   99,   70,   81,   84,
-      150,   94,   82,   85,   68,   83,   86,   70,   87,   88,
-       70,   95,  101,   70,   96,  100,   70,  102,   71,   70,
-      106,   97,   72,   98,  107,  103,  144,   70,   70,   70,
-      144,  104,  110,  171,  109,  105,  111,  134,  134,   70,
-      108,   70,  112,  115,  147,  113,   70,  116,   70,  141,
-      141,  117,  114,  120,   70,  125,  121,  126,  162,  154,
-       70,  118,   70,  122,  119,  218,  128,  123,  124,   70,
+       75,  139,   75,   68,   71,   92,   79,   91,   75,   76,
+       71,   71,   69,   15,   16,   17,   65,   66,   67,   93,
+       71,   81,   71,   94,   71,   68,  100,   71,   82,   85,
+      153,   95,   83,   86,   69,   84,   87,   71,   88,   89,
+       71,   96,  102,   71,   97,  101,   71,  103,   71,   71,
+      107,   98,   72,   99,  108,  104,   73,   71,  147,   71,
+      147,  105,  111,  136,  110,  106,  112,  137,  137,   71,
+      109,   71,  113,  116,  150,  114,   71,  117,   71,  144,
+      144,  118,  115,  121,   71,  126,  122,  127,  165,  157,
+       71,  119,   71,  123,  120,   71,  129,  124,  125,   71,
 
-      131,   70,  127,   70,  132,  149,  129,  138,  133,  138,
-      138,  130,  138,   74,  167,   74,   74,  143,   74,  143,
-      143,   69,  143,   69,   69,  146,   69,   70,   74,   70,
-       74,   74,   69,   74,   70,   70,  155,  148,  151,   74,
-       75,   70,   70,  156,  152,   70,   70,  163,  157,   70,
-       70,   70,   70,   70,  158,   70,   70,  153,   70,   70,
-      170,  177,  209,  159,  160,  165,  164,   70,  161,  166,
-      168,   70,  172,  169,  173,   70,   70,  174,  179,  182,
-      180,   70,   70,  183,   70,   70,  178,   70,  186,   70,
-      175,  176,  187,   70,  189,   70,  185,   70,   70,   70,
+      133,   71,  128,   71,  134,  152,  130,  173,  135,  159,
+      131,  132,  141,  321,  141,  141,   75,  141,   75,   75,
+      146,   75,  146,  146,   70,  146,   70,   70,  149,   70,
+       71,   75,   71,   75,   75,   70,   75,   71,   71,  158,
+      151,  154,   75,   76,   71,   71,   71,  155,   71,  166,
+       71,  160,   71,   71,  164,   71,   71,  161,   71,   71,
+      156,   71,  168,  170,  162,  163,  174,   71,  167,  180,
+      169,  171,  175,   71,  172,   71,  176,   71,  182,  177,
+       71,   71,  183,  185,   71,   71,  187,  186,  190,   71,
+       71,  188,  178,  179,  181,  189,  191,  193,  192,   71,
 
-      181,  193,  188,   70,   70,  184,  190,   70,  195,   70,
-      198,   70,  196,   70,   70,  191,  192,  194,   70,   70,
-       70,  210,  204,   70,  197,   70,  200,  199,  208,  202,
-      203,  207,  201,  205,   70,   70,   70,  206,   70,  213,
-      216,  211,   70,  212,   70,   70,  134,  134,  136,  144,
-      221,  136,  215,  224,  219,  138,  214,  138,  138,   70,
-      138,  217,  220,  141,  141,  143,   70,  143,  143,   74,
-      143,   74,   74,  144,   74,   70,  222,   70,   70,   70,
-      223,  146,   70,   70,   70,  228,   70,  227,  230,  226,
-       70,   70,  225,  233,  251,  232,  235,  229,   70,   70,
+       71,   71,  184,   71,   71,   71,   71,  197,   71,  202,
+      199,   71,  194,   71,  200,   71,   71,   71,  139,  196,
+      195,  139,  198,   71,   71,  213,  201,  208,  204,   71,
+      214,  203,  206,  212,  205,  207,  211,   71,  209,   71,
+       71,   71,  210,   71,   71,   71,  220,   71,   71,   71,
+      215,   71,  223,   71,  226,  216,  217,  222,   71,  219,
+      224,  234,  218,  137,  137,  144,  144,  221,  141,  225,
+      141,  141,  227,  141,  146,   71,  146,  146,   75,  146,
+       75,   75,  147,   75,   71,  228,  230,   71,   71,  229,
+      149,   71,   71,   71,  235,  231,   71,  240,  237,  233,
 
-      234,   70,  236,  237,  231,  238,   70,   70,   70,   70,
-      239,   70,  241,   70,  246,   70,  248,  242,   70,   70,
-      249,  250,  243,  252,   70,  247,   70,  240,  244,  245,
-       70,   70,   70,  253,   70,  260,  258,  259,  255,  254,
-      261,  256,   70,   70,   70,  267,   70,  264,  257,   70,
-      268,   70,  262,  269,  263,  271,  274,   70,   70,   70,
-      266,   70,   70,  265,   70,  270,  272,  273,  276,  275,
-      277,   70,   70,   70,   70,   70,   70,   70,  278,  280,
-      283,   70,   70,  282,   70,  279,   70,  286,   70,  284,
-       70,   70,   70,   70,   70,  281,  290,  285,  292,  294,
+       71,   71,  232,   71,  241,   71,  236,   71,  243,  239,
+      242,  244,   71,  245,  288,   71,  238,   71,  246,   71,
+       71,  253,   71,  248,   71,   71,  257,  255,  249,  256,
+       71,  254,   71,  250,  259,  247,   71,   71,   71,  251,
+      252,  260,   71,  265,   71,   71,   71,  268,   71,  266,
+      267,  261,  269,  262,  263,  258,   71,  264,   71,  275,
+       71,  272,   71,  276,  270,   71,  271,  277,  273,  280,
+       71,  283,   71,   71,  274,   71,  285,   71,   71,  278,
+      279,  281,   71,  284,  286,   71,   71,   71,   71,   71,
+       71,  282,  287,  289,  291,   71,   71,   71,   71,   71,
 
-       70,  287,  297,   70,  288,   70,   70,   70,   70,  299,
-      289,  291,   70,  300,  293,  301,  303,   70,  295,  296,
-      306,   70,   70,  298,   70,  305,   70,  308,   70,  304,
-      309,  302,   70,   70,  144,   70,  315,   70,   70,   70,
-       70,  327,   70,  316,  307,  314,  312,  310,   70,   70,
-      318,   70,   70,  317,  313,  311,   70,  321,   70,   70,
-       70,   70,   70,  325,  319,  320,  322,  323,   70,  328,
-      326,   70,   70,   70,  330,   70,  331,   70,  332,  329,
-      334,   70,   70,  324,  337,  335,  333,   70,  339,   70,
-       70,  336,   70,  340,   70,   70,  342,   70,   70,   70,
+       71,   71,  295,  293,   71,   71,  290,   71,  301,  294,
+      299,  292,  303,  296,   71,  297,  306,   71,   71,  300,
+      298,   71,   71,  308,   71,   71,   71,  147,  310,  302,
+      312,  309,  304,  305,   71,   71,   71,  307,  313,   71,
+      314,  315,   71,  316,  311,  318,   71,   71,  319,   71,
+      147,   71,  322,   71,  324,   71,   71,  326,  327,   71,
+      328,  325,  323,   71,   71,  320,   71,  317,  330,   71,
+      332,  329,   71,   71,   71,   71,   71,  333,   71,  337,
+      338,  335,   71,  339,  331,  340,  334,   71,   71,   71,
+      342,   71,  343,   71,   71,   71,  145,  346,   71,   71,
 
-      341,  338,   70,   70,  347,   70,   70,   70,  348,  343,
-       70,  350,  346,   70,  352,  344,   70,   70,   70,  345,
-      354,  356,   70,   70,  349,  357,   70,   70,  351,   70,
-      355,   70,   70,   70,  353,  358,  364,   70,  359,  366,
-      363,  370,   70,   70,  367,  486,  360,  361,   70,  362,
-      368,  369,   70,   70,  365,  371,   70,   70,  377,   70,
-      372,   70,   70,  373,   70,  375,  376,  378,  374,   70,
-      379,   70,   70,   70,  385,   70,  380,  381,   70,  388,
-       70,   70,   70,  382,  383,   70,  387,  389,  384,   70,
-       70,  399,  394,   70,  390,  386,  392,   70,  393,   70,
+      336,  349,  347,   71,   71,  341,  351,   71,  348,  344,
+      345,   71,   71,   71,  354,  352,   71,  350,  356,   71,
+       71,  355,  358,   71,   71,   71,  361,   71,   71,   71,
+      362,   71,  353,  364,   71,  366,  360,   71,   71,  357,
+       71,  359,  370,  368,   71,   71,  363,  371,   71,  365,
+      369,   71,   71,   71,   71,  367,   71,  372,  378,  379,
+      373,  377,   71,   71,   71,  383,  384,  381,  374,  375,
+       71,  376,  385,   71,  382,   71,   71,  380,  386,   71,
+       71,  387,  392,   71,  388,  389,   71,   71,  390,  391,
+       71,  393,   71,  394,   71,  396,  398,   71,  400,   71,
 
-      391,   70,   70,   70,   70,   70,  395,  400,  398,  396,
-       70,  397,   70,   70,  401,  407,  144,   70,   70,   70,
-      405,   70,  402,  403,  406,  404,  418,  409,   70,   70,
-      457,  408,   70,  417,  410,  411,  419,  421,  422,   70,
-       70,  420,   70,  423,  412,   70,  413,  414,  415,  424,
-      426,  416,   70,  425,   70,   70,   70,   70,  434,   70,
-      427,   70,  432,  428,   70,  429,   70,   70,  438,  431,
-      433,   70,  430,  436,   70,   70,   70,   70,   70,  435,
-      437,  441,  442,  443,   70,   70,   70,  440,  448,   70,
-       70,  142,  439,  445,  446,  444,   70,   70,  447,   70,
+       71,  403,  395,   71,   71,  402,  397,   71,  404,   71,
+       71,   71,  399,  407,  405,  408,   71,   71,  414,  401,
+      406,   71,   71,   71,   71,  409,  413,  415,   71,   71,
+      147,   71,  410,   71,  416,  411,  422,  412,   71,   71,
+       71,   71,  417,  418,  420,  421,   71,  433,   71,  419,
+      143,  437,  423,  424,   71,  432,  425,  426,  434,   71,
+      438,  439,   71,  435,   71,  436,  427,   71,  428,  429,
+      430,   71,   71,  431,  440,   71,   71,  443,   71,   71,
+      451,  442,  441,   71,  449,   71,   71,  444,   71,   71,
+      455,  448,  446,  450,  445,  447,   71,   71,   71,   71,
 
-      449,  450,   70,   70,  453,   70,  459,  452,  454,  461,
-      458,   70,  460,   70,   70,   70,  451,  464,   70,  455,
-      463,  456,   70,  465,   70,  467,   70,   70,   70,   70,
-      471,  472,  462,  469,   70,   70,   70,   70,  473,  468,
-      470,  475,  466,   70,   70,   70,   70,   70,  479,   70,
-      480,   70,  476,   70,   70,   70,  474,  477,  478,  481,
-       70,  483,   70,  484,  487,   70,   70,   70,  482,   70,
-      494,   70,  485,  488,   70,   70,   70,  489,   70,  496,
-      495,   70,   70,  493,  490,  499,  491,  492,  502,  497,
-      498,   70,   70,   70,   70,  501,   70,   70,  500,   70,
+      453,   71,   71,  454,  458,  452,  459,  460,   71,   71,
+       71,   71,  465,   71,  457,   71,   71,  466,  462,  467,
+       71,  461,  456,   71,  463,  464,   71,   71,   71,   71,
+       71,  469,  477,   71,  468,   71,  470,  473,  476,  478,
+      472,  471,  479,  480,   71,   71,   71,   71,  474,   71,
+      475,  481,  482,   71,   71,   71,  486,  483,  487,  484,
+       71,   71,   71,  490,  485,  488,  491,   71,  493,   71,
+       71,  492,   71,   71,  489,  494,   71,   71,  495,   71,
+       71,  500,   71,  499,   71,  496,   71,  501,   71,  498,
+       71,  503,   71,  504,  497,   71,  506,   71,   71,   71,
 
-       70,  505,   70,  506,  508,   70,   70,  504,   70,   70,
-      510,   70,  503,   70,  509,   70,  525,   70,  507,   70,
-      527,  512,  511,   70,  513,  521,  522,   70,  519,  514,
-      520,  515,   70,  524,   70,  526,   70,  523,   70,  516,
-       70,  529,  517,   70,   70,   70,  531,   70,   70,  518,
-      535,  530,  528,  532,   70,   70,  536,   70,  541,  144,
-       70,  539,  533,  540,   70,   70,  534,  537,   70,  538,
-       70,   70,  542,  546,  544,  543,  547,  549,  545,  548,
-       70,   70,  551,   70,   70,   70,   70,   70,   70,  553,
-       70,   70,  555,  550,  556,   70,  552,  560,   70,   70,
+       71,   71,  514,   71,  507,  502,   71,  505,   71,   71,
+      509,  516,  515,   71,   71,  513,  519,  508,  510,  512,
+      511,  518,   71,  517,   71,  522,   71,  521,   71,   71,
+       71,   71,   71,  525,  520,   71,   71,   71,   71,  528,
+      524,  530,   71,   71,  542,  529,   71,   71,   71,  523,
+       71,  526,   71,  527,  531,  543,  532,   71,  533,  541,
+       71,  547,  539,  534,  544,  535,  540,   71,   71,  549,
+      545,  548,  546,  536,   71,   71,  537,   71,   71,   71,
+       71,   71,   71,  538,   71,  555,   71,  551,  559,  550,
+      556,   71,  552,  562,  147,  560,   71,  553,  561,   71,
 
-      554,  140,  561,   70,  563,   70,  557,  564,   70,  558,
-      565,  559,  562,  566,   70,  568,   70,  567,   70,  569,
-       70,   70,   70,   70,   70,  570,  574,   70,  573,   70,
-       70,  572,   70,  575,   70,  577,  579,   70,   70,   70,
-       70,  571,   70,  580,   70,  576,   70,  582,   70,  586,
-       70,  581,  583,   70,  578,  588,  584,  585,  587,   70,
-      590,  592,   70,   70,  589,   70,  594,   70,  591,  595,
-       70,  593,   70,   70,   70,  597,   70,  598,   70,   70,
-       70,  601,   70,   70,  605,  607,  608,  600,  602,  599,
-       70,  596,  604,   70,  603,   70,   70,   70,  612,  606,
+       71,  554,   71,  557,   71,   71,  558,  142,  563,  566,
+       71,   71,  568,  570,   71,  564,  571,  567,   71,  569,
+      565,  573,   71,   71,   71,   71,   71,   71,  575,   71,
+      572,  577,  578,   71,   71,  574,  582,  140,   71,  576,
+       71,  583,   71,  585,   71,  586,   71,  587,   71,  579,
+      581,  584,  580,   71,  588,   71,  589,   71,  590,   71,
+       71,  591,   71,  598,   71,  592,   71,  593,   71,   71,
+      594,   71,  597,   71,   71,  599,   71,  603,   71,  601,
+       71,   71,  595,   71,   71,  596,  604,   71,   71,  610,
+      606,  600,  605,   71,   71,  607,  602,  616,  609,  608,
 
-      609,   70,  614,   70,   70,   70,  613,   70,   70,   70,
-      615,  611,   70,  617,  610,  621,  619,  616,  618,   70,
-       70,   70,  620,   70,  622,  626,  624,   70,   70,  623,
-      629,   70,   70,  628,   70,  630,   70,   70,  631,  627,
-       70,  625,  633,   70,   70,  635,   70,   70,   70,   70,
-       70,   70,   70,  634,  640,   70,   70,  632,  641,  646,
-       70,   70,  636,   70,  637,   70,  638,  642,  639,  643,
-       70,  645,   70,  649,  644,   70,   70,   70,   70,  647,
-      648,  650,  651,  653,   70,   70,  652,   70,   70,  655,
-      658,   70,  654,   70,  657,  659,  660,  656,  661,   70,
+       71,   71,  611,   71,   71,  612,  613,  614,   71,  615,
+       71,  618,   71,  617,  619,   71,   71,  621,   71,   71,
+      622,  626,   71,   71,  625,   71,   71,  630,   71,   71,
+       71,  624,  623,   71,  627,  631,  620,   71,  629,  628,
+      632,   71,   71,   71,  633,  637,  635,  634,   71,  639,
+       71,   71,  797,  638,   71,   71,   71,  636,   71,  640,
+      642,   71,  646,  641,   71,  643,   71,  644,   71,  647,
+      651,   71,   71,  648,  645,  649,   71,   71,   71,  654,
+       71,  656,  653,  652,  655,   71,   71,   71,  658,   71,
+      650,  660,   71,   71,   71,   71,   71,   71,   71,   71,
 
-       70,   70,   70,   70,  144,   70,   70,  663,  668,  667,
-      664,   70,  666,  671,   70,  669,  665,  662,   70,   70,
-      672,  674,   70,   70,  677,   70,   70,  670,  673,   70,
-       70,   70,  675,  679,  682,   70,   70,  676,  680,   70,
-       70,   70,   70,  683,   70,  678,   70,  139,   70,  681,
-       70,  687,  696,  694,  684,  688,   70,  692,  689,   70,
-      697,  686,  695,   70,  685,  690,  699,  693,  691,   70,
-      698,   70,   70,   70,  700,  701,  707,  702,   70,   70,
-      703,  712,   70,   70,  708,  704,  711,   70,   70,  714,
-       70,  705,  706,   70,  713,   70,  709,   70,  716,   70,
+      665,   71,  671,  657,   71,   71,  659,  666,   71,   71,
+      661,  662,  667,  663,   71,  664,   71,  668,  675,  670,
+      669,   71,  674,   71,  672,   71,   71,   71,  673,   71,
+      678,   71,   71,   71,  677,  676,  682,  683,   71,   71,
+      684,   71,  679,  685,  681,   71,  680,   71,  688,   71,
+      686,   71,   71,  147,   71,   71,  689,  687,  693,   71,
+      691,   71,  694,  690,  692,  695,  698,   71,  696,   71,
+      699,  701,   71,   71,   71,  704,  697,   71,  700,   71,
+       71,   71,  702,  706,   71,  709,   71,   71,   71,   71,
+       71,   71,  707,  703,  710,   71,   71,  705,   71,  721,
 
-      717,   70,  718,   70,  710,  715,  719,   70,   70,  720,
-       70,   70,  722,   70,  723,  721,   70,  727,   70,   70,
-       70,  726,   70,   70,  733,   70,   70,  732,  724,   70,
-      725,  734,  735,  728,  729,  731,  736,  730,   70,   70,
-       70,   70,   70,  737,   70,  738,   70,  741,   70,  739,
-       70,  742,  740,  745,   70,  743,   70,  748,   70,   70,
-       70,   70,   70,   70,   70,  746,  747,  752,   70,  744,
-      750,  751,   70,  753,  754,   70,  755,   70,  749,   70,
-       70,   70,   70,   70,  760,  762,   70,  756,  758,  763,
-       70,  765,  761,   70,   70,   70,  757,   70,   70,   70,
+      714,   71,  708,   71,  715,  711,   71,  716,   71,  713,
+       71,  719,  722,  712,  717,  720,   71,  718,   71,  724,
+      723,   71,  725,  727,  726,  728,  739,   71,   71,  737,
+       71,   71,   71,  729,  730,  736,  731,   71,  138,  732,
+      740,  741,   71,  744,  733,  738,   71,   71,  743,   71,
+      734,  735,   71,  742,   71,  745,   71,  746,   71,  747,
+       71,  750,  749,  748,   71,   71,   71,   71,   71,  752,
+       71,  756,   71,   71,   71,  755,   71,   71,  762,   71,
+       71,   71,  761,  751,  760,  763,  753,  754,  757,  764,
+      758,  765,  759,   71,   71,   71,  766,   71,   71,   71,
 
-       70,   70,   70,  764,  759,  771,   70,  770,  774,   70,
-       70,  778,   70,   70,  766,  767,  768,  769,  772,  777,
-      776,  773,  775,   70,  781,   70,  783,   70,   70,  779,
-       70,  784,   70,   70,   70,   70,  791,  780,  788,   70,
-      790,   70,   70,   70,  792,  782,  786,  785,   70,   70,
-       70,  795,  797,   70,  787,   70,  789,   70,  799,  144,
-       70,  793,  794,   70,  801,  800,   70,   70,  796,   70,
-       70,   70,  813,  798,   70,   70,   70,  137,  814,   70,
-      817,  804,  802,   70,   70,   70,  834,   70,   70,  805,
-      803,  806,   70,  819,  815,  807,  841,  808,  818,  820,
+      767,   71,   71,   71,   71,   71,  768,  769,  771,  772,
+      774,   71,   71,   71,  775,  777,   71,   71,   71,  770,
+      776,   71,   71,  773,   71,  779,  780,  781,   71,   71,
+      784,   71,  778,  782,   71,   71,  783,  786,   71,   71,
+       71,  789,  791,  787,  792,   71,  785,   71,   71,  790,
+       71,   71,  794,   71,   71,   71,   71,   71,  800,  788,
+      793,   71,  799,   71,   71,   71,  803,  806,   71,  795,
+      796,  798,   71,  801,  810,  802,  804,  805,  807,   71,
+       71,  812,  809,   71,   71,  808,   71,   71,  813,   71,
+       71,  820,  811,   71,  817,   71,  819,   71,  815,   71,
 
-      816,  809,   70,  810,  821,   70,   70,   70,  811,  822,
-       70,  824,   70,  812,   70,   70,  823,  826,   70,  828,
-      825,   70,   70,   70,  833,  849,  835,  827,  832,  829,
-       70,   70,   70,  836,   70,  831,   70,  843,  837,  830,
-      838,  842,   70,  845,   70,   70,  844,   70,   70,  846,
-       70,  839,   70,  847,  851,   70,  852,  853,  840,   70,
-       70,  848,  854,   70,  857,   70,   70,  850,   70,  855,
-       70,  858,   70,  856,   70,   70,  863,  860,   70,   70,
-       70,  861,   70,   70,  859,  866,   70,  864,   70,   70,
-      862,   70,   70,   70,  865,  872,   70,  868,  870,  867,
+       71,   71,  814,  821,  824,   71,  816,  826,   71,   71,
+       71,  818,   71,  825,  823,   71,  831,  822,  829,  147,
+      828,   71,   71,  827,  830,   71,  832,   71,   71,   71,
+       71,  844,   71,   71,   71,   71,  845,   71,   71,  848,
+      852,  833,  835,  850,   71,  853,   71,  836,  846,  834,
+      837,   71,  849,   71,  838,   71,  839,  855,  851,  847,
+      840,   71,  841,   71,   71,   71,   71,  842,  857,  854,
+      859,   71,  843,   71,  866,  864,  856,  863,  858,   71,
+      860,   71,  865,   71,   71,  861,   71,  862,   71,  869,
+       71,   71,   71,   71,  870,   71,  871,  875,   71,   71,
 
-      871,   70,  873,   70,   70,   70,  869,   70,  876,  877,
-      878,  874,  879,   70,  875,   70,  881,  882,   70,  884,
-      885,   70,  880,   70,  889,  886,   70,   70,   70,  887,
-       70,  883,  888,   70,  893,   70,   70,   70,   70,  895,
-       70,  890,   70,  897,   70,   70,   70,  898,  892,   70,
-      891,  900,   70,   70,  901,  894,   70,  902,  896,  903,
-      899,   70,  905,  906,   70,   70,   70,   70,  904,  909,
-      907,   70,   70,   70,  914,   70,   70,   70,   70,   70,
-       70,  915,  916,  908,   70,  910,  913,  918,   70,  919,
-      911,   70,  912,  917,   70,  922,  923,  920,   70,  925,
+      878,   71,  874,  867,  868,  876,  879,  872,   71,  881,
+      877,   71,  882,   71,  873,   71,  880,  884,   71,  885,
+      886,   71,   71,  890,  887,   71,   71,   71,   71,   71,
+      883,   71,  888,  891,   71,  889,  893,  896,   71,   71,
+      894,   71,   71,   71,  892,   71,  899,  897,   71,  905,
+      895,   71,   71,   71,   71,   71,   71,   71,  898,  901,
+      903,  904,  900,  147,   71,   71,   71,  906,  902,  910,
+      911,  912,  909,  907,  908,   71,   71,  914,   71,  915,
+       71,  918,   71,   71,  913,   71,  919,   71,   71,  920,
+       71,  916,  921,  922,   71,  926,  917,  923,   71,   71,
 
-      921,   70,   70,  926,   70,   70,  924,  930,   70,   70,
-       70,   70,   70,   70,   70,   70,   70,  927,  939,  928,
-      929,  932,   70,   70,   70,  940,   70,  931,  941,  933,
-      936,   70,   70,  935,  942,  938,   70,  937,  934,   70,
-      944,  943,   70,   70,   70,   70,   70,  946,   70,  952,
-       70,   70,  949,  945,   70,   70,   70,  135,  947,   70,
-      961,  950,  955,  948,   70,  953,   70,  951,   70,  957,
-       70,  962,  954,   70,   70,  956,  965,  963,  958,   70,
-      959,   70,  964,  960,   70,   70,  968,   70,  967,   70,
-      970,   70,  966,  972,   70,  973,   70,   70,  974,   70,
+       71,   71,  924,  928,   71,   71,   71,   71,   71,  925,
+      930,  931,   71,  933,   71,   71,  935,  934,  927,   71,
+      929,  936,   71,  932,   71,  938,  939,   71,   71,   71,
+      937,  940,  942,   71,   71,   71,   71,  947,   71,   71,
+       71,  948,  941,   71,  949,   71,  943,   71,  946,   71,
+      951,  952,  944,  955,  945,   71,  950,   71,  956,   71,
+       71,  954,  958,  953,   71,  959,   71,   71,   71,  963,
+      957,   71,   71,   71,   71,   71,   71,  969,   71,  960,
+      962,  961,   71,  965,   71,  972,   71,   71,  974,  964,
+      145,  966,  975,   71,   71,  968,  970,   71,   71,  971,
 
-       70,   70,   70,  969,   70,   70,  971,  978,   70,   70,
-       70,  975,   70,  979,  977,  983,  976,   70,  988,   70,
-       70,  980,   70,  982,   70,  981,  987,  984,  985,   70,
-      986,   70,   70,  989,  993,   70,  992,  990,  994,   70,
-      991,   70,  999,  995,   70,   70,   70,   70, 1009,  997,
-     1008,  996,  998,   70, 1007,   70,   70,   70, 1000, 1006,
-     1010, 1001, 1002,   70,   70,   70, 1003,   70, 1012,   70,
-     1013,   70, 1004, 1011,   70, 1014, 1005, 1015, 1016,   70,
-     1020, 1018, 1021,   70, 1017,   70,   70, 1023,   70, 1019,
-     1022,   70,   70, 1029, 1030,   70,   70,   70,   70,   70,
+      967,   71,  976,  977,   71,   71,   71,  973,   71,  978,
+       71,   71,  983,  981,   71,   71,  987,   71,  984,  979,
+      980,   71,   71,   71,   71,  982,   71,  996,   71,  985,
+      990,   71,   71,  992,  986,  988,  997,   71,   71,  998,
+      989, 1000,  993,  991,  994,   71,   71,  995,   71,   71,
+       71,  999,   71, 1003,   71, 1002,   71, 1005, 1007,   71,
+       71, 1009,   71, 1001, 1010,   71,   71,   71, 1004, 1006,
+       71, 1011,   71,   71, 1008,   71,   71, 1015,   71,   71,
+     1012,   71, 1014,   71, 1016, 1013,   71, 1020,   71,   71,
+       71, 1025, 1017, 1021, 1019, 1024, 1018,   71, 1027, 1022,
 
-     1024, 1032,   70,   70,   70, 1025, 1031, 1026,   70, 1027,
-     1036, 1028, 1035, 1033,   70, 1037,   70, 1034, 1038,   70,
-       70, 1040, 1042, 1039,   70, 1043,   70, 1041,   70,   70,
-       70,   70, 1049,   70,   70, 1045, 1048, 1052, 1044, 1051,
-       70,   70,   70, 1055,   70, 1050, 1046, 1053,   70, 1057,
-       70,   70,   70,   70, 1047,   70, 1058, 1060,   70,   70,
-     1054, 1063,   70,   70, 1062,   70,   70, 1064, 1056,   70,
-     1065,   70, 1066, 1059,   70, 1061, 1069, 1071, 1072, 1070,
-     1068, 1067,   70,   70,   70, 1074,   70, 1073,   70,   70,
-       70,   70, 1078,   70,   70, 1075,   70, 1082,   70,   70,
+       71,   71, 1026, 1023,   71, 1029, 1031,   71,   71, 1028,
+       71, 1032,   71, 1030,   71,   71, 1036,   71, 1045, 1044,
+     1123, 1034,   71, 1033,   71,   71, 1046, 1035,   71,   71,
+     1043, 1048,   71, 1037, 1047,   71, 1038, 1039,   71,   71,
+     1049, 1040,   71, 1050,   71, 1051,   71, 1041, 1053,   71,
+       71, 1042, 1052, 1057, 1054, 1058, 1055,   71, 1078,   71,
+       71,   71, 1059,   71, 1056,   71, 1066, 1060, 1067, 1061,
+       71,   71,   71,   71, 1062,   71, 1063, 1069, 1064,   71,
+     1065,   71, 1068,   71, 1073,   71,   71, 1070, 1072, 1074,
+       71,   71, 1076, 1071,   71, 1075, 1080,   71,   71,   71,
 
-     1077,   70,   70,   70,   70,   70, 1089, 1076,   70,   70,
-     1079, 1086, 1083,   70, 1080,   70, 1087,   70, 1084, 1081,
-     1093, 1085, 1088, 1094,   70,   70,   70, 1098, 1090,   70,
-     1096, 1092, 1099,   70, 1091,   70,   70,   70, 1100,   70,
-     1095,   70,   70, 1101, 1108, 1097, 1106,   70,   70, 1107,
-     1102,   70, 1103, 1110, 1104, 1111,   70, 1105,   70,   70,
-       70, 1109,   70,   70,   70,   70,   70, 1112, 1116, 1119,
-       70,   70,   70,   70, 1114,   70,   70, 1113, 1115,   70,
-     1117,   70,   70, 1122, 1118, 1121, 1123, 1127, 1120,   70,
-     1124, 1125, 1126,   70,   70,   70, 1128, 1130, 1129,   70,
+     1079,  143,   71,   71, 1077,   71, 1082, 1085, 1081, 1086,
+       71, 1088,   71,   71,   71,   71, 1083, 1089, 1087,   71,
+     1090, 1092,   71,   71, 1084, 1093, 1094,   71, 1095, 1097,
+       71,   71, 1091,   71,   71,   71,   71,   71, 1099,   71,
+     1096, 1101, 1100, 1105, 1102,   71, 1103,   71,   71, 1108,
+     1109, 1098,   71, 1104, 1106,   71,   71, 1110, 1111,   71,
+       71, 1107,   71,   71,   71, 1115,   71,   71, 1112,   71,
+     1119,   71,   71, 1114,   71,   71,   71,   71, 1126, 1113,
+       71,   71,   71, 1116,   71, 1120, 1124, 1117, 1131,   71,
+       71, 1121, 1118, 1125, 1122, 1130,   71,   71, 1135,   71,
 
-     1132,   70, 1135, 1131,   70, 1137, 1138, 1134,   70, 1136,
-     1133,   70,   70,   70, 1139,   70, 1140, 1141,   70,   70,
-       70,   70,   70, 1142,   70,   70, 1144,   70, 1148, 1143,
-       70, 1147,   70,   70,   70, 1145, 1154, 1146, 1150, 1151,
-       70, 1155,   70, 1156,   70, 1149, 1152,   70, 1157,   70,
-       70, 1162, 1153,   70,   70,   70, 1166,   70,   70,   70,
-     1158, 1165,   70, 1159,   70,   70, 1160,   70,   70, 1161,
-       70,   70, 1174, 1164,   70, 1177,   70, 1167, 1168, 1163,
-       70, 1171,   70, 1169, 1170, 1173, 1176,   70,   70, 1172,
-     1175,   70,   70, 1178,   70, 1179,   70,   70,   70,   70,
+     1127, 1133, 1129, 1136,   71, 1132, 1128,   71, 1137,   71,
+       71,   71,   71,   71,   71, 1138, 1134, 1143, 1147,   71,
+     1144, 1145,   71, 1139,   71, 1140, 1141, 1146,   71, 1142,
+       71,   71, 1148, 1149,   71,   71, 1153,   71,   71,   71,
+     1151,   71, 1157, 1158,   71,   71,   71,   71,   71, 1150,
+       71,   71, 1152, 1154,   71,   71, 1156, 1155, 1161, 1166,
+       71, 1162, 1159, 1163, 1160, 1164,   71, 1167,   71,   71,
+     1165, 1168,   71, 1169,   71, 1171,   71, 1170, 1173,   71,
+       71, 1176, 1177, 1181, 1172, 1175,   71,   71,   71,   71,
+     1178,   71, 1179, 1180,   71, 1182,   71, 1174,   71,   71,
 
-     1183,   70, 1186, 1181, 1184, 1180, 1188,   70,   70, 1182,
-       70,   70, 1190, 1187,   70, 1189, 1195, 1185, 1191, 1192,
-       70, 1194,   70, 1196,   70,   70,   70, 1199, 1200, 1193,
-     1198, 1201,   70,   70,   70, 1202,   70,   70, 1197,   70,
-     1204,   70, 1205,   70,   70, 1208,   70,   70,   70, 1203,
-     1212,   70, 1210,   70, 1206,   70,   70, 1213,   70, 1215,
-     1209,   70,   70, 1211,   70,   70, 1218,   70, 1207,   70,
-     1220,   70, 1217, 1221,   70, 1214,   70,   70, 1216,   70,
-     1224,   70, 1225, 1219,   70, 1222, 1229,   70,   70, 1226,
-     1223, 1227,   70, 1228, 1231,   70, 1233, 1235,   70,   70,
+       71,   71, 1187,   71,   71,   71, 1186,   71,   71, 1190,
+       71, 1193, 1184, 1189, 1183, 1185, 1194,   71,   71, 1195,
+       71, 1191,   71, 1188, 1196,   71, 1201, 1192,   71,   71,
+     1197,   71,   71,   71,   71,   71, 1205, 1198,   71, 1199,
+     1204, 1200,   71,   71,   71,   71,   71, 1213, 1203, 1210,
+     1206,   71, 1207,   71, 1202,   71, 1214, 1208, 1216,   71,
+     1212,   71, 1209, 1215,   71, 1211, 1217,   71, 1218,   71,
+       71,   71,   71, 1222,   71, 1225,   71, 1223, 1220, 1228,
+     1219, 1227,   71, 1221,   71,   71,   71,   71, 1226, 1229,
+     1224, 1230, 1234, 1235,   71,   71, 1231, 1239,   71,   71,
 
-     1232,   70,   70,   70, 1237,   70,   70, 1230, 1234,   70,
-       70, 1241, 1236,   70, 1242, 1239,   70,   70, 1238,   70,
-     1243,   70, 1246,   70, 1247, 1240,   70,   70,   70, 1260,
-     1253,   70, 1245, 1248, 1244,   70,   70,   70, 1250,   70,
-     1255, 1251, 1254, 1259, 1256,   70, 1249,   70, 1258,   70,
-       70,   70, 1257, 1252, 1264,   70,   70, 1266,   70,   70,
-       70, 1265,   70,   70, 1268, 1261, 1269,   70,   70, 1262,
-       70, 1263,   70, 1270,   70,   70, 1271, 1278, 1267,   70,
-       70,   70, 1272,   70,   70,   70, 1274, 1276, 1275,   70,
-     1273,   70, 1277, 1283,   70,   70, 1285,   70, 1281,   70,
+       71, 1238, 1232,   71, 1237,   71, 1233, 1240,   71, 1241,
+       71,   71,   71, 1236, 1243,   71, 1244,   71,   71, 1247,
+       71, 1242,   71,   71, 1251,   71,   71, 1245, 1249,   71,
+     1252,   71, 1254,   71, 1248,   71,   71, 1250,   71,   71,
+     1257,   71, 1246,   71, 1259,   71, 1256, 1260,   71, 1253,
+       71,   71, 1263,   71,   71, 1255,   71, 1258, 1264, 1261,
+       71, 1268,   71, 1265, 1262, 1266,   71, 1271, 1270, 1267,
+     1272,   71, 1274,   71, 1269,   71,   71,   71,   71, 1276,
+       71,   71,   71, 1278,   71, 1280,   71, 1275,   71, 1281,
+       71, 1273,   71, 1285, 1277,   71, 1282,   71, 1286,   71,
 
-     1279, 1280,   70, 1286,   70,   70, 1282,   70,   70, 1284,
-     1287, 1288,   70,   70, 1291, 1293, 1294,   70,   70, 1295,
-     1300,   70, 1290, 1289, 1301,   70,   70, 1292,   70, 1296,
-       70, 1302, 1297,   70,   70, 1304, 1311, 1298,   70,   70,
-       70,   70,   70, 1299,   70, 1303,   70, 1306, 1308, 1305,
-     1310, 1309,   70, 1307, 1312,   70,   70, 1314,   70,   70,
-     1313,   70,   70, 1321, 1315,   70, 1316,   70,   70,   70,
-     1318,   70, 1317, 1324,   70, 1325, 1323,   70,  144, 1320,
-     1327, 1322, 1332, 1328, 1319, 1330,   70, 1329,   70, 1326,
-     1331,   70, 1334,   70, 1335, 1333,   70, 1337,   70, 1340,
+       71,   71, 1292, 1289, 1283, 1279, 1290, 1284,   71,   71,
+     1294, 1287,   71,   71, 1293, 1288,   71, 1295, 1291, 1297,
+     1298,   71, 1299,   71,   71,   71,   71,   71, 1300,   71,
+     1305,   71, 1310,   71,   71, 1307,   71, 1301, 1296, 1306,
+       71,   71,   71, 1302,   71, 1309, 1303, 1311,   71, 1304,
+       71,   71,   71, 1319, 1308,   71,   71,   71,   71,   71,
+       71,   71, 1312, 1324,   71, 1315, 1316, 1317, 1313, 1318,
+     1314,   71,   71, 1327, 1322,   71,   71, 1320, 1321,   71,
+     1326,   71, 1323,   71,   71,   71,   71,   71,   71,   71,
+     1329, 1325,   71, 1332, 1328, 1334, 1335, 1341,   71, 1336,
 
-       70, 1336,   70,   70, 1338,   70, 1339,   70,   70,   70,
-     1342,   70,   70,   70, 1350, 1341, 1343, 1345,   70,   70,
-       70,   70, 1353,   70, 1346,   70,  142, 1344,   70,   70,
-     1347, 1349, 1348, 1355,   70, 1351,   70,   70,   70, 1352,
-       70, 1356, 1357, 1358,   70, 1354, 1362,   70, 1363, 1359,
-       70, 1360,   70,   70,   70,   70, 1369, 1364,   70, 1361,
-       70,   70,   70,   70, 1365, 1366, 1374, 1372, 1373,   70,
-     1370, 1375,   70, 1367,   70, 1368,   70,   70, 1371, 1376,
-     1378,   70,   70,   70, 1380, 1377, 1381,   70,   70, 1379,
-       70,   70,   70,   70,   70,   70,   70, 1386,   70,   70,
+     1333, 1331, 1337,   71, 1338, 1330, 1342,   71,   71, 1339,
+       71, 1343,   71,   71,   71, 1345,   71, 1340,   71,   71,
+     1352,   71, 1344, 1347,   71, 1351,   71, 1349, 1346,   71,
+     1350,   71, 1348, 1353,   71, 1357,   71, 1355,   71, 1354,
+       71,   71, 1362, 1359,   71,   71,   71, 1356,   71,   71,
+     1366, 1365, 1358,   71, 1364, 1373,   71,  142, 1361,   71,
+     1363,   71, 1368, 1360, 1367, 1369, 1370, 1371, 1375,   71,
+     1376, 1378, 1372,   71, 1374,   71,   71,   71,   71, 1380,
+     1377, 1381,   71,   71, 1379,   71, 1383,   71,   71,   71,
+       71,   71, 1384,   71, 1391, 1382, 1386,   71,   71,   71,
 
-     1390,   70, 1387,   70, 1395,   70, 1388, 1382, 1384, 1385,
-     1383, 1389, 1391, 1396, 1394,   70,   70,   70, 1393,   70,
-     1400,   70, 1397, 1402,   70, 1392,   70, 1404,   70,   70,
-       70,   70, 1406, 1405, 1398, 1408, 1399, 1401,   70,   70,
-     1410,   70, 1407, 1413,   70,   70,   70, 1403, 1409,   70,
-       70, 1414, 1412, 1415,   70,   70, 1411, 1422,   70,   70,
-       70,   70,   70,   70, 1424, 1420, 1416, 1417, 1418, 1425,
-       70,   70, 1428, 1419, 1426, 1421, 1430,   70, 1423, 1427,
-       70,   70,   70, 1433, 1434,   70, 1429,   70,   70, 1431,
-       70, 1436,   70,   70, 1439, 1440,   70,   70,   70, 1443,
+       71,   71, 1387,   71, 1385, 1396, 1390,  140, 1388,   71,
+     1389, 1394,   71, 1392, 1397,   71, 1393,   71,   71, 1395,
+     1398,   71, 1399, 1403,   71,   71, 1401, 1400,   71,   71,
+       71,   71,   71,   71, 1410, 1405, 1402,   71,   71, 1404,
+       71, 1406, 1407,  138, 1413, 1411, 1414,   71,   71,   71,
+     1408, 1415, 1409, 1416,   71, 1412,   71,   71, 1418, 1419,
+       71, 1417,   71,   71, 1421,   71, 1422,   71,   71, 1420,
+       71,   71,   71,   71,   71,   71, 1427,   71, 1431,   71,
+       71, 1428,   71, 1432,   71, 1423, 1425, 1429, 1426, 1424,
+     1436,   71, 1430,   71, 1437, 1435, 1433,   71, 1441, 1434,
 
-       70, 1432,   70,   70,   70,   70, 1441,   70, 1437,   70,
-     1445,   70, 1448, 1435, 1438,   70, 1446, 1444, 1452, 1442,
-     1451,   70,   70,   70,   70, 1450, 1455, 1456, 1458, 1454,
-     1447, 1449,   70,   70, 1457,   70,   70,   70,   70,   70,
-       70, 1453,   70, 1463,   70, 1459,   70, 1466,   70,   70,
-     1462,   70,   70, 1468,   70,   70,   70, 1460, 1461, 1473,
-     1464,   70, 1474, 1467,   70,   70, 1471, 1476,   70, 1469,
-     1465, 1470, 1477, 1472, 1475, 1479,   70, 1478,   70,   70,
-     1483, 1484,   70, 1485, 1487, 1480,   70, 1488, 1486,   70,
-       70,   70, 1481,   70,   70, 1491,   70,   70,   70, 1482,
+       71, 1442,   71, 1438, 1440, 1443,   71,   71, 1445,   71,
+       71,   71, 1439, 1447,   71, 1448, 1449,   71, 1451,   71,
+     1450,   71,   71, 1453,   71,   71,   71, 1444, 1455,   71,
+     1458, 1446, 1456,   71,   71, 1457,   71, 1452, 1459, 1460,
+     1461,   71,   71, 1465,   71, 1462, 1454, 1467,   71,   71,
+     1470,   71, 1468,   71,   71,   71,   71, 1473,   71,   71,
+       71, 1463, 1464,   71, 1466, 1469, 1471, 1474,   71, 1472,
+     1477,   71,   71, 1479,   71,   71, 1475,   71, 1482,   71,
+     1476, 1483,   71,   71, 1484,   71, 1478,   71, 1480, 1486,
+       71,   71, 1488,   71,   71, 1491, 1481, 1495, 1487,   71,
 
-       70,   70, 1493,   70, 1496,   70, 1490, 1498, 1492, 1494,
-       70,   70,   70,   70, 1500, 1499,  140, 1489,   70, 1501,
-     1502,   70, 1503,   70, 1505, 1495,   70, 1497,   70,   70,
-       70, 1507, 1504,   70, 1506, 1508,   70,   70,   70,   70,
-     1511, 1510, 1509,   70,   70, 1516,   70,   70,   70, 1515,
-     1512, 1513,   70, 1518,   70, 1514, 1517, 1519, 1520,   70,
-       70,   70,   70,   70,   70,   70, 1527, 1525,   70, 1522,
-     1526,   70,   70,   70, 1521,   70, 1529,   70, 1528, 1523,
-     1532, 1524, 1533, 1534,   70,   70, 1531, 1530,   70, 1538,
-       70,   70, 1540, 1535,   70,   70, 1541, 1542,   70,   70,
+     1485,   71, 1489,   71,   71,   71, 1494,   71, 1498,   71,
+     1499,   71, 1497, 1490,   71, 1493,   71, 1492, 1500,   71,
+       71,   71,   71, 1505, 1496, 1501,   71, 1503, 1504, 1506,
+     1502,   71,   71, 1509,   71,   71,   71,   71,   71, 1511,
+     1507,   71, 1516,   71,   71, 1519,   71,   71,   71, 1510,
+     1517, 1514, 1518, 1522,   71, 1512, 1513, 1508, 1520,   71,
+     1515,   71, 1526, 1521, 1527,   71, 1528,   71,   71, 1523,
+     1530, 1529,   71, 1524, 1531,   71,   71, 1534,   71,   71,
+       71, 1525,   71,   71,   71,   71, 1536, 1533, 1539, 1541,
+     1535, 1537,   71, 1532,   71,   71,   71,   71, 1544, 1543,
 
-     1536,   70, 1537,   70,   70, 1546, 1544, 1539,   70, 1543,
-       70,   70,   70,   70,   70,   70,   70, 1547,   70,  139,
-       70,   70, 1554, 1545, 1549, 1550, 1551, 1558,   70,   70,
-     1553, 1548, 1557,   70,   70, 1555, 1561, 1552, 1556, 1559,
-       70,   70,   70,   70, 1565, 1562, 1564,   70,   70, 1560,
-       70,   70, 1567, 1570, 1563, 1568,   70, 1572,   70, 1569,
-       70, 1566,   70,   70,   70, 1575,   70, 1574,   70, 1576,
-     1571, 1577,   70, 1580,   70,   70,   70,   70,   70,   70,
-     1581, 1586,   70,   70, 1583,   70, 1573, 1582, 1579, 1590,
-     1578,   70, 1585,   70, 1587,   70, 1584,   70, 1588,   70,
+     1545,   71, 1546,   71, 1542,   71, 1548, 1540,   71, 1538,
+       71,   71,   71,   71, 1549, 1550,   71, 1551,   71,   71,
+       71, 1553, 1552, 1554,   71, 1547,   71,   71, 1559,   71,
+     1555, 1556, 1558,   71,   71, 1560, 1557,   71, 1561, 1562,
+     1563,   71,   71,   71,   71,   71,   71,   71, 1570, 1568,
+       71, 1565, 1569,   71,   71,   71, 1572, 1564,   71,   71,
+     1571, 1566, 1575, 1567,   71, 1578,   71, 1573, 1574,   71,
+     1582, 1577,   71, 1576,   71, 1579,   71,   71, 1584,   71,
+       71, 1585, 1586,   71, 1580,   71, 1581,   71, 1587,   71,
+     1590, 1583, 1588,   71,   71,   71,   71,   71,   71,   71,
 
-       70, 1592, 1591, 1593,   70, 1589,   70, 1594,   70, 1595,
-       70,   70, 1598, 1596, 1600,   70, 1597,   70,   70,   70,
-     1601, 1599,   70, 1603, 1604,   70,   70,   70,   70, 1602,
-       70,   70,   70,   70, 1609, 1605, 1611,   70, 1616,   70,
-       70, 1618,   70, 1608, 1607, 1606, 1615, 1610, 1613, 1617,
-       70,   70,   70,   70, 1612, 1620, 1623, 1614, 1621,   70,
-       70, 1624,   70, 1627,   70, 1622,   70, 1625,   70, 1619,
-       70, 1628, 1632,   70,   70, 1631,   70, 1633, 1636,   70,
-     1626,   70,   70,   70,   70, 1629, 1634, 1637, 1638,   70,
-       70,   70, 1640, 1644,   70, 1639, 1630, 1635,   70,   70,
+       71,   71, 1591,   71, 1602,   71, 1598, 1589, 1593, 1594,
+     1595,   71,   71, 1601, 1597, 1592,   71,   71,   71, 1599,
+     1605, 1596,   71, 1600,   71,   71, 1609, 1606,   71, 1603,
+     1608,   71, 1604,   71,   71,   71, 1607, 1614, 1611,   71,
+     1613, 1612, 1616,   71, 1617,   71, 1610,   71,   71, 1619,
+     1618,   71,   71, 1615,   71, 1624, 1620, 1621,   71,   71,
+       71,   71,   71, 1625,   71,   71, 1622,   71, 1627, 1630,
+       71, 1634, 1626,   71, 1623,   71, 1631,   71, 1629,   71,
+     1632, 1628,   71,   71, 1635, 1636,   71, 1633,   71, 1638,
+       71, 1639,   71,   71, 1637, 1640,   71,   71, 1641, 1642,
 
-       70, 1642,   70, 1641, 1643,   70, 1646, 1645,   70, 1647,
-     1648,   70, 1651,   70,   70,   70,   70, 1655, 1652,   70,
-       70, 1654,   70,   70,   70,   70, 1649, 1650,   70,   70,
-     1653, 1665,   70,   70,   70,   70,   70, 1666, 1656, 1657,
-     1662,   70, 1715, 1660,   70, 1658, 1661, 1659, 1664, 1667,
-     1663,   70, 1670, 1671,   70, 1668,   70, 1669, 1672,   70,
-       70,   70, 1675,   70, 1678,   70,   70,   70,   70,   70,
-       70, 1673, 1676, 1674, 1679, 1677,   70, 1684,   70,   70,
-     1683, 1680, 1685,   70, 1687,   70, 1681, 1682,   70, 1686,
-     1689,   70, 1690,   70,   70,   70,   70, 1688, 1694,   70,
+     1644,   71, 1645,   71,   71,   71,   71,   71, 1646, 1647,
+     1648,   71,   71, 1643,   71,   71, 1649,   71, 1653,   71,
+     1655,   71, 1660,   71,   71, 1651, 1650, 1652, 1662,   71,
+     1659, 1654, 1657, 1661,   71,   71,   71,   71, 1656, 1664,
+     1667, 1665,   71,   71, 1658, 1668,   71, 1671,   71,   71,
+     1666, 1669,   71, 1663,   71, 1672, 1676,   71, 1675,   71,
+     1677,   71, 1670,   71, 1678, 1680, 1682,   71, 1681, 1673,
+       71,   71, 1684,   71,   71, 1683,   71, 1685,   71, 1679,
+     1674,   71,   71,   71,   71, 1687,   71, 1689,   71,   71,
+       71, 1692, 1695,   71, 1686,   71,   71,   71,   71, 1691,
 
-     1693,   70, 1691, 1696,   70,   70,   70,   70, 1700, 1699,
-       70, 1698,   70, 1692,   70, 1695, 1702,   70,   70, 1697,
-     1706,   70,   70, 1701,   70,   70,   70, 1704,   70, 1703,
-     1710, 1711,   70, 1705, 1713,   70,   70,   70, 1707, 1709,
-       70, 1717,   70,   70, 1712, 1708, 1718,   70, 1714, 1719,
-       70,   70,   70,   70, 1720, 1721,   70,   70, 1725,  137,
-       70, 1726, 1716,   70, 1723,   70,   70,   70, 1722, 1728,
-       70,   70, 1727, 1724, 1729, 1730, 1731, 1732, 1733,   70,
-     1736,   70, 1737, 1734,   70, 1738,   70, 1739,   70,   70,
-     1735,   70,   70,   70,   70, 1740,   70,   70,   70,   70,
+     1696, 1688, 1698,   71, 1694, 1697, 1690, 1693, 1701,   71,
+       71,   71,   71,   71,   71,   71,   71, 1700, 1710,   71,
+       71, 1699, 1702,   71,   71,   71, 1707, 1711,   71, 1712,
+     2394, 1705, 1728, 1703, 1706, 1704, 1708,   71, 1709, 1713,
+       71, 1714,   71, 1715, 1716,   71, 1717,   71,   71, 1720,
+       71,   71, 1718, 1719, 1723,   71, 1724,   71,   71, 1721,
+       71,   71, 1722, 1725, 1729,   71, 1730,   71,   71, 1732,
+       71, 1734,   71, 1735,   71,   71,   71, 1726,   71, 1733,
+     1727, 1739,   71, 1738,   71, 1741,   71, 1731,   71, 1736,
+       71,   71,   71, 1745, 1744, 1737, 1743, 1747,   71,   71,
 
-     1749, 1744,   70, 1750, 1743, 1745,   70,  135, 1741, 1747,
-     1742, 1748, 1746, 1753,   70, 1754,   70,   70, 1752,   70,
-     1755, 1757, 1751, 1758, 1756, 1759,   70,   70,   70,   70,
-       70, 1761,   70,   70,   70,   70, 1765,   70, 1768,   70,
-       70, 1766, 1760, 1767, 1762,   70,   70, 1763,   70,   70,
-     1769,   70,   70, 1764,   70, 1773, 1776,   70,   70, 1775,
-       70, 1781,   70, 1772, 1777,   70, 1770,   70, 1771,   70,
-     1780,   70, 1774, 1783,   70, 1778, 1779, 1782,   70, 1785,
-       70,   70,   70, 1786,   70, 1788, 1789, 1790, 1784,   70,
-     1792,   70,   70,   70,   70, 1794,   70,   70,   70,   70,
+       71,   71,   71, 1740, 1751,   71, 1742,   71, 1746,   71,
+       71, 1756,   71,   71, 1755, 1749, 1758,   71, 1748,   71,
+     1750,   71, 1752,   71, 1754,   71, 1762,   71, 1760,   71,
+     1753, 1764, 1757,   71,   71,   71, 1763,   71,   71, 1759,
+     1766,   71,   71, 1770,   71, 1765,   71, 1771,   71, 1761,
+     1768,   71,   71, 1773,   71,   71, 2394, 1774, 1778, 1767,
+     1775, 1772, 1769, 1776,   71,   71, 1777,   71, 1783, 1779,
+       71, 1782,   71, 1784,   71, 1780, 1781,   71,   71,   71,
+       71, 1785,   71,   71,   71,   71,   71, 1794, 1789,   71,
+       71, 1795, 1790, 1788, 2394, 1793,   71, 1786, 1791, 1787,
 
-       70, 1791, 1796, 1793, 1797, 1798,   70, 1787, 1799,   70,
-     1795, 1800,   70, 1801, 1802,   70,   70,   70,   70,   70,
-     1804, 1809, 1803, 1807,   70,   70,   70,   70, 1808,   70,
-     1806, 1812,   70,   70, 1813, 1805, 1814,   70,   70,   70,
-     1816, 1811,   70, 1810, 1815,   70,   70, 1820,   70, 1821,
-       70, 1819, 1822,   70,   70,   70, 1817,   70, 1825, 1818,
-       70,   70,   70,   70,   70,   70, 1823,   70, 1828,   70,
-     1831,   70, 1826, 1824, 1827, 1829, 1833,   70, 1834,   70,
-       70,   70,   70,   70, 1830,   70, 1840, 1832,   70,   70,
-       70,   70, 1841, 1837, 1845,   70, 1839, 1835,   70, 1836,
+     1792, 1801, 1797, 1798,   71, 1799,   71,   71, 1802, 1796,
+     1800, 1803, 1804,   71,   71,   71,   71,   71,   71, 1806,
+       71,   71,   71, 1810,   71,   71,   71, 1812, 1807, 1805,
+     1811, 1813,   71,   71, 1808,   71,   71,   71, 1814,   71,
+     1809, 1818,   71, 1821,   71, 1815,   71, 1820,   71,   71,
+     1817,   71, 1822,   71, 1826, 1816, 1825,   71,   71, 1819,
+       71, 1827, 1823,   71, 1824, 1828,   71, 1830,   71,   71,
+     1835, 1829, 1831,   71, 1833,   71,   71, 1837,   71, 1834,
+     1836,   71, 1839,   71, 1832,   71,   71,   71, 1843,   71,
+     1838, 1841, 1842, 1844,   71, 1845,   71, 1846,   71,   71,
 
-     1849,   70,   70, 1847,   70, 1838, 1842, 1848,   70, 1846,
-       70, 1843,   70, 1844, 1850,   70,   70, 1851,   70, 1852,
-       70, 1854, 1853,   70,   70,   70,   70, 1855,   70,   70,
-       70, 1863, 1856,   70, 1860, 1864,   70, 1865, 1857,   70,
-       70,   70,   70,   70, 1859, 1858, 1861, 1862, 1867,   70,
-       70, 1866, 1873,   70, 1868, 1874,   70, 1875, 1869, 1871,
-     1870,   70,   70,   70,   70, 1877,   70,   70, 1872, 1879,
-       70,   70,   70, 1883, 1885, 1882, 1884,   70,   70, 1876,
-       70, 1878, 1886,   70,   70,   70, 1880, 1881,   70, 1888,
-       70, 1893,   70, 1892,   70,   70,   70, 1887, 1896,   70,
+       71,   71,   71, 1840,   71, 1849,   71, 1852,   71, 1854,
+       71, 1853,   71, 2394, 1847,   71, 1857,   71, 1851,   71,
+     1858, 1848,   71, 1850, 1859,   71,   71, 1856, 1855,   71,
+       71, 1860, 1861,   71, 1865,   71, 1862,   71, 1864, 1866,
+       71, 1867,   71, 1863,   71,   71, 1870,   71,   71, 1868,
+       71,   71,   71,   71,   71, 1878,   71, 1873, 1876, 1871,
+     1872,   71, 1869, 1874,   71,   71,   71,   71,   71,   71,
+     1879,   71, 1875,   71, 1877,   71, 1885,   71, 1886, 1882,
+       71,   71, 1884, 1890,   71, 1881, 1892,   71,   71, 1887,
+     1880, 1883, 1893, 1894,   71, 1888, 1895,   71, 1891,   71,
 
-     1897,   70,   70,   70, 1889, 1891, 1899, 1890,   70, 1894,
-     1900,   70,   70, 1895, 1902,   70, 1898, 1903,   70, 1905,
-       70, 1901, 1904,   70, 1907,   70,   70, 1908, 1906,   70,
-       70,   70,   70,   70, 1909,   70, 1912,   70, 1914, 1911,
-       70, 2349, 1910, 1915,   70,   70, 1913,   70, 1917,   70,
-     1919,   70, 1920, 1922,   70,   70, 1916, 1923,   70, 1918,
-       70, 1926, 1924,   70, 1921, 1925, 1929,   70, 1927,   70,
-     1928,   70, 1931,   70, 1932,   70, 1930,   70,   70, 1935,
-     1939, 1934,   70,   70, 1936,   70,   70, 1937, 1938,   70,
-     1933,   70,   70, 1940,   70,   70, 1941,   70,   70,   70,
+     1889,   71, 1896,   71, 1897,   71, 1898,   71,   71,   71,
+     1899,   71,   71,   71,   71, 1908,   71, 1909,   71,   71,
+     1905,   71,   71,   71, 1900,   71, 1902, 1901, 1910, 1912,
+       71, 1903, 1904, 1906, 1907,   71,   71,   71, 1913, 1911,
+     1918,   71,   71, 1914, 1919,   71, 1920,   71, 1915,   71,
+       71, 1916,   71,   71, 1924, 1917, 1923,   71,   71, 1928,
+     1921,   71, 1922, 1927, 1929,   71,   71,   71, 1930,   71,
+     1925, 1931,   71, 1926,   71,   71, 1933,   71,   71,   71,
+     1932, 1937, 1938,   71, 1941,   71,   71,   71,   71, 1934,
+     1942,   71, 1939, 1935,   71, 1936,   71, 1940, 1944, 1945,
 
-       70, 1942, 1945, 1944,   70, 1948,   70, 1947,   70, 1943,
-     1946,   70,   70,   70, 1953,   70,   70, 1949,   70, 1950,
-     1951, 1952, 1958,   70, 1954,   70,   70, 1955,   70, 1962,
-       70,   70,   70,   70,   70, 1960, 1956, 1957, 1966, 1967,
-     1968,   70,   70, 1961, 1959,   70,   70, 1964,   70,   70,
-     1963,   70,   70, 1965, 1969, 1972, 1970, 1971,   70,   70,
-     1976,   70, 1973, 1974, 1977,   70,   70, 1975,   70, 1980,
-     1981,   70,   70, 1983,   70, 1982,   70, 1984, 1985,   70,
-       70, 1978, 1987,   70,   70,   70, 1979, 1990, 1991,   70,
-       70, 1993,   70,   70, 1992, 1986, 1994,   70,   70, 1989,
+       71, 1946, 1943, 1947,   71, 1948,   71, 1950,   71,   71,
+     1949, 1952,   71,   71, 1951,   71, 1953,   71, 1954,   71,
+       71,   71, 1957,   71,   71,   71, 1955,   71, 1956, 1959,
+       71, 1960,   71, 1962, 1958, 1964,   71, 1965, 1967,   71,
+     1961,   71, 1963, 1968,   71,   71, 1971,   71, 1969,   71,
+     1970, 1966,   71,   71, 1972,   71, 1973,   71, 1975, 1976,
+       71, 1980, 1974, 1977,   71,   71, 1981,   71, 1979,   71,
+     1978,   71, 1984,   71, 1982,   71, 1983, 1985,   71,   71,
+     1986,   71,   71,   71,   71,   71,   71,   71, 1987, 1990,
+     1989,   71, 1993,   71, 1992, 1991, 1988,   71,   71, 1995,
 
-     1997,   70, 1988,   70, 1996,   70,   70, 1999, 2000,   70,
-     2001,   70,   70,   70,   70, 1995, 2003, 2005,   70, 2002,
-       70,   70,   70,   70,   70, 2008, 1998, 2012,   70,   70,
-       70, 2014,   70, 2016,   70, 2006, 2007, 2004, 2011, 2009,
-       70, 2017, 2010,   70, 2018,   70,   70,   70, 2013, 2015,
-     2019, 2020,   70,   70,   70,   70, 2026,   70,   70,   70,
-       70, 2023, 2027, 2029,   70, 2021, 2349, 2030, 2031,   70,
-       70, 2028,   70, 2022, 2024, 2025, 2034, 2032,   70, 2033,
-     2035,   70, 2036,   70,   70, 2039,   70,   70, 2043,   70,
-     2040,   70, 2037,   70,   70, 2042,   70,   70,   70, 2038,
+       71, 1998, 1996, 1994,   71,   71, 1997, 1999,   71, 2003,
+       71,   71,   71,   71, 2007,   71,   71,   71,   71, 2394,
+       71, 2005,   71, 2000, 2011, 2001, 2018, 2002, 2006,   71,
+     2004, 2012, 2009, 2013,   71, 2008,   71,   71, 2010,   71,
+       71,   71, 2017,   71, 2014, 2015,   71, 2021, 2016, 2022,
+       71,   71,   71,   71, 2025, 2019, 2026,   71, 2020,   71,
+     2028,   71, 2027,   71, 2029, 2030,   71,   71, 2032,   71,
+       71, 2023, 2024,   71, 2035, 2036,   71,   71, 2038,   71,
+       71, 2037, 2031, 2039,   71,   71, 2042, 2034, 2033,   71,
+       71, 2041,   71,   71, 2044, 2045,   71,   71, 2046,   71,
 
-     2041,   70, 2044,   70,   70, 2050, 2045,   70, 2049, 2047,
-     2051,   70, 2052,   70, 2053, 2055,   70, 2054,   70, 2048,
-     2056, 2046,   70,   70, 2060,   70,   70,   70, 2059,   70,
-       70, 2061, 2062, 2063,   70,   70,   70,   70, 2057, 2068,
-     2066, 2058,   70, 2064,   70,   70, 2070,   70, 2073,   70,
-     2065,   70,   70,   70, 2067,   70, 2075,   70,   70, 2072,
-       70, 2071, 2069, 2080, 2074,   70, 2076,   70, 2079, 2077,
-     2082,   70, 2084,   70, 2078, 2085,   70,   70, 2087,   70,
-       70,   70,   70, 2090,   70,   70, 2083, 2089,   70,   70,
-     2094, 2081,   70,   70, 2097,   70, 2088,   70, 2086, 2098,
+       71,   71, 2040, 2048, 2050, 2047,   71,   71,   71,   71,
+       71, 2053, 2057,   71, 2043,   71,   71,   71, 2061,   71,
+       71, 2056,   71, 2062, 2049, 2051, 2052, 2054, 2059,   71,
+     2055,   71, 2063,   71, 2058, 2060,   71,   71, 2065, 2066,
+       71,   71, 2071,   71,   71, 2064, 2068, 2072,   71, 2074,
+       71,   71, 2076,   71,   71,   71,   71,   71, 2075, 2077,
+     2069, 2070, 2067,   71, 2078,   71, 2073, 2080,   71, 2081,
+       71, 2084, 2082,   71, 2079,   71, 2085,   71, 2088,   71,
+       71,   71, 2091,   71, 2087, 2083, 2086,   71,   71, 2089,
+       71,   71,   71, 2090,   71, 2092, 2094,   71, 2095, 2096,
 
-       70, 2091,   70,   70,   70,   70, 2095, 2093, 2092, 2104,
-       70, 2099,   70, 2106,   70, 2096, 2102, 2100,   70,   70,
-       70, 2105, 2101, 2109,   70, 2103, 2107, 2110,   70,   70,
-       70, 2112,   70, 2111,   70,   70,   70,   70, 2113, 2108,
-     2114, 2115, 2117, 2116, 2120,   70, 2121,   70,   70, 2118,
-     2119, 2123,   70, 2122,   70,   70,   70, 2127,   70, 2124,
-       70, 2126, 2128,   70, 2129,   70,   70, 2131,   70, 2125,
-       70, 2130,   70, 2134, 2135,   70,   70,   70,   70, 2132,
-     2139,   70,   70,   70,   70, 2142,   70, 2138, 2140, 2145,
-     2136,   70, 2133,   70, 2143,   70, 2141, 2137, 2144,   70,
+       71, 2101,   71, 2098,   71, 2097, 2099, 2103, 2093, 2100,
+       71,   71, 2105,   71, 2102,   71, 2104,   71,   71,   71,
+     2106,   71, 2107, 2108,   71, 2110, 2111, 2113,   71, 2115,
+       71, 2109,   71,   71,   71, 2118,   71, 2112,   71,   71,
+       71,   71, 2120,   71,   71,   71,   71, 2127,   71, 2117,
+     2121, 2116, 2119, 2114, 2124,   71, 2122, 2129,   71,   71,
+     2125,   71, 2123,   71, 2128, 2130,   71, 2132,   71,   71,
+     2126, 2135,   71,   71, 2134,   71,   71, 2133,   71, 2139,
+     2131,   71,   71, 2136, 2142,   71, 2143,   71,   71,   71,
+     2140, 2144,   71,   71, 2138,   71, 2137, 2149,   71,   71,
 
-       70,   70,   70,   70,   70, 2148,   70, 2150,   70,   70,
-       70, 2151,   70, 2146, 2149, 2147,   70,   70,   70, 2162,
-       70, 2349, 2160, 2152, 2163,   70, 2153, 2155, 2154, 2157,
-     2158, 2159, 2156,   70, 2165,   70,   70, 2164, 2161, 2166,
-       70, 2167, 2168,   70,   70, 2170,   70, 2169,   70, 2173,
-       70,   70,   70,   70, 2171,   70, 2175,   70, 2174,   70,
-     2179,   70, 2172, 2180,   70,   70, 2178,   70, 2176, 2181,
-       70,   70, 2183, 2177, 2184, 2186, 2182, 2185, 2188,   70,
-     2187,   70,   70,   70,   70,   70,   70, 2214, 2192, 2349,
-     2193, 2195,   70,   70, 2190,   70, 2189, 2196,   70, 2197,
+       71, 2147, 2150, 2141,   71, 2151, 2154, 2152, 2145, 2155,
+       71, 2146,   71, 2148,   71, 2157,   71, 2156,   71,   71,
+     2153,   71,   71, 2159, 2160, 2162,   71, 2165,   71, 2166,
+       71,   71,   71,   71, 2158, 2168,   71,   71, 2169,   71,
+       71, 2161, 2171, 2163, 2164, 2172,   71, 2173,   71, 2174,
+       71, 2167,   71, 2170, 2176,   71,   71, 2175,   71, 2177,
+       71, 2179, 2180,   71,   71,   71, 2184,   71,   71,   71,
+     2187,   71, 2181, 2185, 2183,   71,   71,   71, 2178, 2188,
+     2189,   71, 2190, 2186, 2182,   71,   71,   71,   71,   71,
+       71, 2193,   71,   71, 2195, 2191,   71, 2196,   71, 2194,
 
-       70, 2198,   70, 2191, 2200, 2194, 2199,   70, 2201,   70,
-     2202,   70,   70,   70,   70, 2205,   70, 2207,   70,   70,
-       70,   70,   70, 2209,   70, 2204,   70, 2203,   70, 2211,
-       70, 2206,   70, 2213,   70,   70,   70, 2208, 2215, 2216,
-     2212,   70,   70,   70, 2220, 2217, 2222, 2210,   70,   70,
-     2218, 2219,   70,   70,   70,   70, 2228, 2227,   70, 2221,
-       70, 2230, 2224, 2223, 2226,   70,   70,   70,   70,   70,
-     2229, 2231, 2225,   70, 2239,   70,   70,   70, 2241,   70,
-       70, 2242, 2234,   70, 2232, 2233, 2240,   70, 2236, 2237,
-     2238, 2243,   70, 2235, 2244,   70,   70,   70,   70, 2247,
+       71,   71,   71, 2205,   71, 2192, 2207,   71,   71, 2197,
+     2208,   71, 2198, 2199, 2200, 2394, 2201,   71, 2202, 2203,
+       71, 2209, 2217, 2204, 2206, 2210,   71, 2211,   71, 2212,
+     2213,   71,   71, 2215,   71, 2214, 2218,   71, 2216,   71,
+       71,   71,   71,   71, 2220,   71, 2219,   71, 2224, 2225,
+       71,   71, 2223, 2226,   71,   71, 2221,   71,   71, 2233,
+     2222,   71, 2228, 2231, 2229,   71, 2227, 2230, 2232,   71,
+     2234,   71,   71, 2235,   71, 2394, 2237, 2238, 2240,   71,
+     2241,   71, 2236, 2242,   71, 2243,   71, 2244,   71,   71,
+     2246,   71,   71, 2239, 2247,   71,   71,   71, 2245,   71,
 
-       70,   70, 2245, 2248, 2252, 2249,   70, 2246, 2254,   70,
-       70,   70,   70,   70, 2258,   70, 2251,   70, 2259,   70,
-     2253,   70, 2250,   70,   70,   70, 2262, 2256, 2263, 2260,
-     2255, 2257,   70,   70,   70,   70,   70, 2264, 2261,   70,
-     2269,   70,   70, 2266,   70, 2267, 2265, 2271,   70, 2268,
-       70,   70,   70,   70,   70, 2349, 2276, 2273, 2277, 2270,
-     2272, 2274, 2280,   70,   70, 2283,   70,   70, 2282, 2275,
-     2278, 2281, 2284, 2279,   70,   70,   70,   70, 2288,   70,
-     2285, 2286,   70, 2291,   70, 2290,   70, 2289,   70,   70,
-       70,   70, 2296,   70,   70, 2299, 2287, 2293,   70,   70,
+     2250, 2252,   71,   71,   71,   71,   71, 2248, 2249, 2254,
+       71, 2256, 2251,   71, 2259,   71, 2258,   71,   71,   71,
+       71, 2253, 2261, 2257,   71,   71,   71,   71, 2265, 2260,
+     2255, 2267,   71,   71,   71, 2264,   71, 2262,   71,   71,
+     2273, 2272, 2263,   71,   71, 2275,   71, 2269,   71, 2266,
+     2271,   71, 2268,   71,   71,   71,   71, 2270, 2274, 2276,
+       71, 2284,   71,   71, 2286,   71,   71, 2277,   71, 2278,
+     2279, 2281, 2285,   71, 2283, 2282,   71, 2287, 2280, 2288,
+       71, 2289,   71,   71,   71, 2290, 2292,   71, 2291, 2293,
+       71, 2297, 2294,   71, 2299,   71,   71,   71, 2295,   71,
 
-       70, 2300,   70,   70, 2303,   70,   70, 2292, 2294,   70,
-     2295,   70, 2297, 2298, 2301,   70, 2307, 2302,   70,   70,
-       70, 2311, 2304, 2308, 2306, 2305,   70,   70, 2313,   70,
-     2314,   70, 2309,   70,   70, 2310, 2315, 2318,   70,   70,
-     2316,   70,   70, 2320, 2319, 2312, 2321,   70,   70, 2322,
-       70,   70,   70, 2317,   70, 2323, 2325, 2327,   70,   70,
-       70,   70,   70,   70, 2329, 2330,   70, 2333,   70, 2324,
-     2349, 2326, 2349, 2328, 2334,   70,   70, 2337, 2338,   70,
-     2331, 2332, 2335,   70, 2340,   70,   70, 2336, 2341,   70,
-     2339,   70,   70, 2342,   70,   70, 2343, 2344, 2347,   70,
+       71, 2303,   71,   71, 2304, 2296,   71, 2298,   71,   71,
+       71, 2307,   71, 2308, 2301, 2300, 2305,   71, 2302,   71,
+       71,   71,   71, 2309,   71, 2306, 2314,   71,   71, 2311,
+       71,   71, 2312, 2310,   71, 2313, 2316,   71,   71,   71,
+       71, 2318, 2321, 2319, 2315, 2322, 2317, 2325,   71,   71,
+       71, 2327,   71, 2320, 2326, 2329, 2323,   71, 2324,   71,
+     2328,   71,   71, 2333,   71,   71, 2330, 2331, 2336,   71,
+     2334, 2332, 2335,   71,   71,   71,   71,   71, 2341,   71,
+       71,   71, 2338, 2394,   71,   71, 2344, 2345,   71, 2346,
+       71,   71, 2347, 2337, 2343, 2339, 2340,   71, 2342,   71,
 
-     2348,   70, 2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349,
-     2349, 2349, 2349, 2345, 2346,   42,   42,   42,   42,   42,
-       42,   42,   47,   47,   47,   47,   47,   47,   47,   52,
-       52,   52,   52,   52,   52,   52,   58,   58,   58,   58,
-       58,   58,   58,   63,   63,   63,   63,   63,   63,   63,
-       73,   73, 2349,   73,   73,   73,   73,  134,  134, 2349,
-     2349, 2349,  134,  134,  136,  136, 2349, 2349,  136, 2349,
-      136,  138, 2349, 2349, 2349, 2349, 2349,  138,  141,  141,
-     2349, 2349, 2349,  141,  141,  143, 2349, 2349, 2349, 2349,
-     2349,  143,  145,  145, 2349,  145,  145,  145,  145,   74,
+       71, 2352, 2348,   71,   71,   71,   71, 2356, 2353, 2349,
+     2350,   71, 2351,   71, 2358,   71, 2359, 2354,   71,   71,
+       71, 2363,   71, 2360,   71,   71, 2361, 2365,   71, 2364,
+     2357, 2355, 2366,   71,   71, 2367,   71,   71,   71, 2362,
+       71, 2368, 2370, 2372,   71,   71,   71,   71,   71,   71,
+     2374, 2375,   71, 2378,   71, 2369, 2394, 2371, 2394, 2373,
+     2379,   71,   71, 2382, 2383,   71, 2376, 2377, 2380,   71,
+     2385,   71,   71, 2381, 2386,   71, 2384,   71,   71, 2387,
+       71,   71, 2388, 2389, 2392,   71, 2393,   71, 2394, 2394,
+     2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394, 2390,
 
-       74, 2349,   74,   74,   74,   74,   13, 2349, 2349, 2349,
-     2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349,
-     2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349,
-     2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349,
-     2349, 2349, 2349, 2349, 2349, 2349, 2349
+     2391,   43,   43,   43,   43,   43,   43,   43,   48,   48,
+       48,   48,   48,   48,   48,   53,   53,   53,   53,   53,
+       53,   53,   59,   59,   59,   59,   59,   59,   59,   64,
+       64,   64,   64,   64,   64,   64,   74,   74, 2394,   74,
+       74,   74,   74,  137,  137, 2394, 2394, 2394,  137,  137,
+      139,  139, 2394, 2394,  139, 2394,  139,  141, 2394, 2394,
+     2394, 2394, 2394,  141,  144,  144, 2394, 2394, 2394,  144,
+      144,  146, 2394, 2394, 2394, 2394, 2394,  146,  148,  148,
+     2394,  148,  148,  148,  148,   75,   75, 2394,   75,   75,
+       75,   75,   13, 2394, 2394, 2394, 2394, 2394, 2394, 2394,
+
+     2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394,
+     2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394,
+     2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394,
+     2394, 2394, 2394
     } ;
 
-static yyconst flex_int16_t yy_chk[4648] =
+static yyconst flex_int16_t yy_chk[4734] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -1726,510 +1752,520 @@ static yyconst flex_int16_t yy_chk[4648] =
         3,    3,    3,    4,    4,    4,    5,    5,    6,    6,
         5,    3,    6,   20,    4,   20,   20,    5,   20,    6,
         7,    7,    7,    7,   20,    7,    8,    8,    8,    8,
-     2355,    8,    7,    9,    9,    9,   22,   22,    8,   10,
+     2400,    8,    7,    9,    9,    9,   22,   22,    8,   10,
        10,   10,   15,   25,    9,   21,   15,   25,   21,   21,
-       10,   11,   11,   11,   11,   11,   11,   19,   51,   19,
+       10,   11,   11,   11,   11,   11,   11,   19,   52,   19,
 
-       19,   51,   19,   11,   26,   26,   21,   25,   19,   19,
-       78,   29,   11,   12,   12,   12,   12,   12,   12,   26,
+       19,   52,   19,   11,   26,   26,   21,   25,   19,   19,
+       79,   29,   11,   12,   12,   12,   12,   12,   12,   26,
        23,   23,   27,   27,   24,   12,   29,   31,   23,   24,
-       78,   27,   23,   24,   12,   23,   24,   28,   24,   24,
-       30,   28,   31,   34,   28,   30,   32,   32,   71,   33,
-       33,   28,   71,   28,   33,   32,  799,   35,   95,   36,
-       68,   32,   35,   95,   34,   32,   35,   46,   46,   87,
-       33,   81,   35,   36,   68,   35,   37,   37,   38,   62,
-       62,   37,   35,   38,   39,   39,   38,   39,   87,   81,
-      130,   37,   40,   38,   37,  130,   40,   38,   38,   41,
+       79,   27,   23,   24,   12,   23,   24,   28,   24,   24,
+       30,   28,   31,   34,   28,   30,   32,   32,   42,   33,
+       33,   28,   72,   28,   33,   32,   72,   35,  829,   36,
+       69,   32,   35,   42,   34,   32,   35,   47,   47,   88,
+       33,   82,   35,   36,   69,   35,   37,   37,   38,   63,
+       63,   37,   35,   38,   39,   39,   38,   39,   88,   82,
+      226,   37,   40,   38,   37,   84,   40,   38,   38,   41,
 
-       41,   77,   39,   91,   41,   77,   40,   57,   41,   57,
-       57,   40,   57,   65,   91,   65,   65,   67,   65,   67,
-       67,   70,   67,   70,   70,   65,   70,   82,   73,   83,
-       73,   73,   70,   73,   76,   79,   82,   76,   79,   73,
-       73,   80,   84,   83,   80,   85,   86,   88,   84,   90,
-      123,   89,   92,   88,   84,   93,   94,   80,   96,   99,
-       94,   98,  123,   85,   85,   89,   88,   98,   86,   90,
-       92,   97,   96,   93,   97,  100,  101,   97,   99,  101,
-      100,  102,  103,  101,  104,  105,   98,  107,  104,  106,
-       97,   97,  105,  108,  107,  109,  103,  111,  110,  112,
+       41,   78,   39,   95,   41,   78,   40,   95,   41,   84,
+       40,   40,   58,  226,   58,   58,   66,   58,   66,   66,
+       68,   66,   68,   68,   71,   68,   71,   71,   66,   71,
+       83,   74,   87,   74,   74,   71,   74,   77,   80,   83,
+       77,   80,   74,   74,   81,   85,   86,   81,   90,   89,
+       91,   85,   92,   93,   87,   89,   94,   85,   97,  100,
+       81,   96,   90,   92,   86,   86,   96,  103,   89,   99,
+       91,   93,   97,   98,   94,   99,   98,  101,  100,   98,
+      102,  104,  101,  102,  105,  107,  103,  102,  105,  106,
+      108,  103,   98,   98,   99,  104,  106,  108,  107,  109,
 
-      100,  111,  106,  113,  114,  102,  108,  116,  113,  115,
-      115,  119,  113,  117,  118,  109,  110,  112,  121,  120,
-      124,  124,  120,  126,  114,  125,  117,  116,  122,  118,
-      119,  121,  117,  120,  122,  127,  128,  120,  129,  126,
-      129,  124,  131,  125,  132,  133,  135,  135,  137,  143,
-      133,  137,  128,  149,  131,  139,  127,  139,  139,  149,
-      139,  129,  132,  142,  142,  144,  153,  144,  144,  145,
-      144,  145,  145,  147,  145,  148,  147,  150,  151,  152,
-      148,  145,  154,  155,  156,  153,  157,  152,  155,  151,
-      169,  159,  150,  158,  169,  157,  159,  154,  168,  158,
+      110,  111,  101,  112,  113,  114,  115,  112,  116,  116,
+      114,  117,  109,  124,  114,  118,  120,  119,  140,  111,
+      110,  140,  113,  122,  121,  124,  115,  121,  118,  125,
+      125,  117,  119,  123,  118,  120,  122,  126,  121,  123,
+      127,  128,  121,  129,  130,  131,  130,  132,  133,  135,
+      125,  134,  132,  155,  135,  126,  127,  131,  136,  129,
+      133,  155,  128,  138,  138,  145,  145,  130,  142,  134,
+      142,  142,  136,  142,  147,  156,  147,  147,  148,  147,
+      148,  148,  150,  148,  151,  150,  152,  153,  154,  151,
+      148,  157,  152,  158,  156,  153,  159,  161,  158,  154,
 
-      158,  160,  160,  161,  156,  162,  165,  162,  163,  161,
-      162,  166,  163,  164,  164,  167,  166,  163,  170,  171,
-      167,  168,  163,  170,  172,  165,  173,  162,  163,  163,
-      174,  175,  176,  171,  177,  177,  175,  176,  173,  172,
-      177,  173,  178,  179,  180,  181,  186,  178,  174,  182,
-      182,  181,  177,  183,  177,  184,  187,  185,  196,  183,
-      180,  184,  187,  179,  188,  183,  185,  186,  189,  188,
-      190,  191,  192,  193,  189,  194,  190,  195,  191,  193,
-      196,  197,  199,  195,  198,  192,  200,  199,  201,  197,
-      202,  203,  206,  204,  205,  194,  203,  198,  205,  207,
+      160,  196,  153,  161,  161,  162,  157,  163,  163,  160,
+      162,  164,  168,  165,  196,  165,  159,  164,  165,  166,
+      167,  167,  169,  166,  170,  177,  171,  169,  166,  170,
+      172,  168,  171,  166,  172,  165,  173,  174,  175,  166,
+      166,  173,  176,  177,  178,  179,  180,  180,  182,  178,
+      179,  174,  180,  175,  176,  171,  181,  176,  183,  184,
+      187,  181,  185,  185,  180,  184,  180,  186,  182,  188,
+      190,  191,  189,  186,  183,  188,  193,  191,  192,  186,
+      187,  189,  193,  192,  194,  195,  198,  197,  199,  200,
+      194,  190,  195,  197,  199,  201,  202,  203,  204,  205,
 
-      208,  200,  209,  210,  201,  207,  212,  211,  209,  211,
-      202,  204,  214,  212,  206,  213,  215,  216,  208,  208,
-      218,  213,  215,  210,  217,  217,  218,  219,  220,  216,
-      220,  214,  221,  219,  222,  223,  225,  224,  226,  231,
-      237,  237,  225,  226,  218,  224,  222,  220,  227,  229,
-      228,  230,  232,  227,  223,  221,  228,  231,  234,  233,
-      235,  239,  242,  235,  229,  230,  232,  233,  236,  238,
-      236,  243,  238,  240,  240,  241,  241,  244,  242,  239,
-      244,  245,  246,  234,  247,  245,  243,  248,  249,  253,
-      247,  246,  250,  250,  249,  251,  252,  254,  255,  256,
+      206,  208,  203,  201,  209,  207,  198,  210,  209,  202,
+      207,  200,  211,  204,  212,  205,  213,  214,  211,  208,
+      206,  215,  213,  215,  216,  218,  220,  146,  217,  210,
+      219,  216,  212,  212,  217,  229,  219,  214,  220,  221,
+      221,  222,  222,  223,  218,  224,  225,  227,  225,  223,
+      228,  224,  227,  230,  229,  233,  237,  231,  232,  238,
+      233,  230,  228,  231,  232,  225,  234,  223,  235,  236,
+      237,  234,  239,  240,  235,  241,  242,  238,  243,  242,
+      243,  240,  244,  244,  236,  245,  239,  246,  245,  247,
+      247,  248,  248,  249,  251,  250,  144,  251,  252,  253,
 
-      251,  248,  252,  257,  257,  258,  259,  260,  258,  253,
-      261,  260,  256,  262,  262,  254,  263,  264,  265,  255,
-      264,  266,  267,  268,  259,  267,  272,  266,  261,  269,
-      265,  270,  273,  271,  263,  268,  271,  373,  269,  272,
-      270,  275,  275,  277,  273,  373,  269,  269,  274,  269,
-      274,  274,  276,  278,  271,  276,  279,  280,  281,  281,
-      277,  284,  282,  277,  287,  279,  280,  282,  278,  283,
-      283,  286,  285,  288,  289,  290,  284,  285,  296,  292,
-      289,  291,  293,  286,  287,  292,  291,  293,  288,  294,
-      297,  299,  296,  295,  294,  290,  295,  299,  295,  298,
+      241,  254,  252,  255,  262,  246,  256,  254,  253,  249,
+      250,  257,  256,  258,  258,  257,  259,  255,  260,  261,
+      263,  259,  262,  264,  260,  265,  265,  266,  267,  268,
+      266,  269,  257,  268,  270,  270,  264,  271,  273,  261,
+      272,  263,  274,  272,  275,  276,  267,  275,  274,  269,
+      273,  277,  278,  279,  281,  271,  280,  276,  279,  280,
+      277,  278,  282,  283,  286,  283,  283,  281,  277,  277,
+      287,  277,  284,  284,  282,  285,  296,  280,  285,  288,
+      289,  286,  290,  290,  286,  287,  291,  293,  288,  289,
+      294,  291,  292,  292,  295,  294,  296,  297,  298,  299,
 
-      294,  301,  300,  302,  303,  304,  297,  300,  298,  297,
-      305,  297,  306,  307,  301,  306,  312,  310,  309,  313,
-      304,  343,  301,  302,  305,  303,  310,  307,  314,  315,
-      343,  306,  308,  309,  308,  308,  311,  312,  313,  316,
-      318,  311,  311,  314,  308,  319,  308,  308,  308,  315,
-      317,  308,  320,  316,  321,  323,  317,  322,  324,  325,
-      317,  326,  322,  318,  324,  319,  327,  329,  328,  321,
-      323,  330,  320,  326,  328,  333,  331,  334,  335,  325,
-      327,  331,  332,  332,  336,  332,  337,  330,  337,  340,
-      341,  141,  329,  334,  335,  333,  338,  339,  336,  342,
+      300,  301,  293,  302,  298,  300,  295,  301,  302,  303,
+      304,  305,  297,  304,  303,  304,  306,  307,  308,  299,
+      303,  310,  309,  311,  308,  305,  307,  309,  312,  313,
+      323,  314,  306,  316,  310,  306,  316,  306,  320,  317,
+      319,  324,  310,  311,  313,  314,  325,  320,  326,  312,
+      143,  323,  316,  317,  318,  319,  318,  318,  321,  322,
+      324,  325,  327,  321,  321,  322,  318,  328,  318,  318,
+      318,  330,  331,  318,  326,  332,  333,  329,  335,  334,
+      336,  328,  327,  329,  334,  337,  336,  329,  338,  339,
+      340,  333,  331,  335,  330,  332,  340,  341,  342,  343,
 
-      338,  339,  345,  346,  341,  344,  345,  340,  342,  347,
-      344,  348,  346,  350,  349,  347,  339,  350,  351,  342,
-      349,  342,  352,  351,  353,  353,  354,  356,  355,  357,
-      357,  358,  348,  355,  359,  360,  361,  358,  359,  354,
-      356,  361,  352,  362,  365,  363,  364,  368,  365,  366,
-      366,  372,  362,  375,  367,  374,  360,  363,  364,  367,
-      369,  369,  371,  371,  374,  376,  378,  379,  368,  380,
-      381,  382,  372,  375,  383,  384,  381,  376,  387,  383,
-      382,  392,  385,  380,  378,  386,  378,  379,  389,  384,
-      385,  386,  388,  390,  389,  388,  391,  393,  387,  395,
+      338,  345,  346,  339,  343,  337,  344,  344,  347,  344,
+      349,  348,  349,  350,  342,  351,  352,  350,  346,  351,
+      353,  345,  341,  354,  347,  348,  355,  358,  356,  357,
+      362,  352,  358,  360,  351,  359,  353,  356,  357,  359,
+      355,  354,  360,  361,  366,  368,  363,  374,  356,  361,
+      356,  362,  363,  364,  365,  367,  367,  364,  368,  365,
+      369,  370,  371,  371,  366,  369,  372,  373,  374,  376,
+      375,  373,  372,  377,  370,  375,  378,  379,  376,  380,
+      381,  381,  382,  380,  383,  377,  387,  382,  388,  379,
+      384,  384,  386,  386,  378,  389,  388,  390,  391,  394,
 
-      394,  391,  398,  392,  394,  396,  397,  390,  400,  402,
-      396,  401,  389,  405,  395,  406,  405,  404,  393,  407,
-      407,  398,  397,  399,  399,  402,  403,  408,  400,  399,
-      401,  399,  403,  404,  411,  406,  410,  403,  412,  399,
-      409,  409,  399,  413,  414,  415,  411,  416,  417,  399,
-      415,  410,  408,  412,  418,  419,  416,  424,  422,  421,
-      423,  419,  413,  421,  422,  426,  414,  417,  428,  418,
-      425,  427,  423,  427,  425,  424,  428,  430,  426,  429,
-      429,  431,  432,  430,  433,  435,  434,  436,  432,  434,
-      438,  437,  436,  431,  437,  439,  433,  440,  448,  441,
+      393,  395,  396,  397,  389,  383,  398,  387,  396,  399,
+      391,  398,  397,  400,  402,  395,  401,  390,  393,  394,
+      393,  400,  401,  399,  403,  404,  405,  403,  406,  407,
+      410,  404,  408,  406,  402,  409,  411,  413,  412,  409,
+      405,  411,  415,  417,  418,  410,  423,  416,  419,  404,
+      418,  407,  421,  408,  412,  418,  413,  414,  414,  417,
+      422,  422,  415,  414,  419,  414,  416,  420,  424,  424,
+      420,  423,  421,  414,  425,  426,  414,  427,  428,  429,
+      430,  431,  434,  414,  432,  430,  436,  426,  434,  425,
+      431,  433,  427,  438,  437,  436,  439,  428,  437,  438,
 
-      435,  140,  440,  440,  442,  442,  438,  443,  443,  438,
-      444,  439,  441,  445,  445,  447,  444,  446,  446,  448,
-      449,  447,  450,  451,  452,  449,  453,  455,  452,  454,
-      456,  451,  453,  454,  457,  456,  458,  460,  459,  462,
-      464,  450,  458,  459,  461,  455,  467,  461,  463,  463,
-      465,  460,  461,  468,  457,  465,  461,  462,  464,  466,
-      467,  469,  470,  471,  466,  472,  471,  469,  468,  472,
-      473,  470,  474,  475,  476,  473,  477,  474,  479,  478,
-      480,  477,  483,  484,  481,  483,  484,  476,  478,  475,
-      481,  472,  480,  482,  479,  485,  486,  487,  488,  482,
+      440,  429,  441,  432,  443,  442,  433,  141,  439,  442,
+      444,  445,  444,  446,  446,  440,  447,  443,  448,  445,
+      441,  449,  447,  450,  452,  451,  453,  449,  451,  454,
+      448,  453,  454,  455,  456,  450,  457,  139,  458,  452,
+      465,  457,  457,  459,  459,  460,  460,  461,  467,  455,
+      456,  458,  455,  461,  462,  462,  463,  463,  464,  469,
+      466,  465,  468,  472,  464,  466,  470,  467,  471,  472,
+      468,  473,  471,  474,  475,  473,  476,  477,  479,  475,
+      481,  478,  469,  477,  483,  470,  478,  480,  482,  482,
+      480,  474,  479,  486,  487,  480,  476,  488,  481,  480,
 
-      485,  489,  490,  494,  488,  497,  489,  491,  490,  495,
-      491,  487,  492,  493,  486,  496,  494,  492,  493,  493,
-      498,  496,  495,  499,  497,  500,  499,  501,  502,  498,
-      503,  500,  505,  502,  507,  503,  503,  504,  504,  501,
-      506,  499,  506,  508,  509,  508,  510,  511,  512,  514,
-      513,  516,  515,  507,  513,  517,  518,  505,  514,  519,
-      520,  521,  509,  524,  510,  519,  511,  515,  512,  516,
-      528,  518,  522,  522,  517,  525,  527,  523,  526,  520,
-      521,  523,  524,  526,  529,  531,  525,  530,  532,  528,
-      531,  533,  527,  534,  530,  532,  533,  529,  534,  535,
+      484,  485,  483,  488,  489,  484,  485,  486,  490,  487,
+      491,  490,  492,  489,  491,  493,  494,  492,  495,  496,
+      493,  497,  497,  499,  496,  498,  500,  501,  506,  502,
+      662,  495,  494,  501,  498,  502,  491,  503,  500,  499,
+      503,  504,  505,  507,  504,  508,  506,  505,  509,  510,
+      517,  508,  662,  509,  514,  510,  511,  507,  512,  511,
+      513,  515,  516,  512,  518,  513,  513,  514,  516,  517,
+      520,  521,  519,  518,  515,  519,  520,  522,  525,  523,
+      524,  524,  522,  521,  523,  523,  526,  527,  526,  528,
+      519,  528,  529,  530,  531,  532,  533,  535,  534,  536,
 
-      536,  537,  538,  539,  540,  541,  543,  536,  541,  540,
-      537,  542,  539,  544,  544,  542,  538,  535,  549,  545,
-      545,  546,  546,  547,  550,  551,  553,  543,  545,  552,
-      550,  554,  547,  552,  555,  556,  557,  549,  553,  558,
-      555,  559,  562,  556,  568,  551,  560,  138,  570,  554,
-      565,  560,  570,  568,  557,  560,  569,  562,  560,  571,
-      571,  559,  569,  576,  558,  560,  573,  565,  560,  572,
-      572,  575,  573,  574,  574,  574,  575,  574,  577,  578,
-      574,  580,  580,  579,  576,  574,  579,  581,  582,  582,
-      583,  574,  574,  590,  581,  585,  577,  584,  584,  586,
+      533,  537,  539,  525,  538,  540,  527,  534,  539,  541,
+      529,  530,  535,  531,  543,  532,  544,  536,  543,  538,
+      537,  542,  542,  545,  540,  546,  547,  548,  541,  550,
+      546,  549,  551,  552,  545,  544,  550,  551,  553,  555,
+      552,  556,  547,  553,  549,  554,  548,  557,  556,  558,
+      554,  559,  560,  561,  564,  565,  557,  555,  561,  562,
+      559,  563,  562,  558,  560,  563,  566,  566,  564,  567,
+      567,  568,  568,  569,  571,  572,  565,  573,  567,  574,
+      575,  572,  569,  574,  576,  577,  578,  579,  580,  581,
+      590,  577,  575,  571,  578,  582,  584,  573,  587,  590,
 
-      585,  587,  586,  589,  578,  583,  587,  588,  592,  588,
-      591,  593,  590,  594,  591,  589,  595,  595,  596,  598,
-      597,  594,  600,  599,  601,  601,  602,  600,  592,  609,
-      593,  602,  603,  596,  597,  599,  604,  598,  603,  606,
-      605,  607,  604,  605,  608,  606,  610,  609,  611,  607,
-      612,  610,  608,  613,  613,  611,  614,  616,  615,  617,
-      623,  619,  620,  616,  621,  614,  615,  621,  622,  612,
-      619,  620,  625,  622,  623,  624,  624,  626,  617,  627,
-      628,  629,  633,  631,  629,  631,  634,  625,  627,  632,
-      632,  634,  629,  635,  637,  636,  626,  638,  639,  643,
+      582,  602,  576,  596,  582,  579,  591,  582,  600,  581,
+      595,  584,  591,  580,  582,  587,  592,  582,  593,  593,
+      592,  594,  594,  596,  595,  597,  602,  601,  607,  600,
+      599,  597,  598,  598,  598,  599,  598,  603,  137,  598,
+      603,  604,  604,  607,  598,  601,  605,  606,  606,  613,
+      598,  598,  609,  605,  608,  608,  610,  609,  611,  610,
+      612,  613,  612,  611,  614,  615,  616,  618,  617,  615,
+      619,  619,  623,  620,  622,  618,  621,  624,  625,  625,
+      627,   70,  624,  614,  623,  627,  616,  617,  620,  628,
+      621,  629,  622,  630,  631,  628,  630,  629,  632,  633,
 
-      641,  640,  642,  633,  628,  640,  645,  639,  643,  648,
-      644,  647,  647,  646,  635,  636,  637,  638,  641,  646,
-      645,  642,  644,  649,  650,  651,  652,  653,  654,  648,
-      650,  653,  652,  656,  655,  657,  659,  649,  656,  658,
-      658,  660,  659,  661,  660,  651,  655,  654,  664,  662,
-      668,  663,  665,  665,  655,  666,  657,  663,  667,  667,
-      669,  661,  662,  670,  669,  668,  672,  673,  664,  675,
-      676,  678,  678,  666,  679,  681,  682,  136,  679,  680,
-      682,  673,  670,  683,  700,  685,  697,  697,  684,  675,
-      672,  676,  677,  684,  680,  677,  700,  677,  683,  685,
+      631,  634,  636,  635,  637,  639,  632,  633,  635,  636,
+      638,  638,  640,  642,  639,  641,  644,  645,  651,  634,
+      640,  641,  648,  637,  646,  644,  645,  646,  647,  649,
+      649,  650,  642,  647,  652,  653,  648,  651,  654,  658,
+      656,  654,  656,  652,  657,  657,  650,  659,  660,  654,
+      661,  663,  659,  664,  665,  666,  667,  668,  665,  653,
+      658,  671,  664,  670,  669,  673,  668,  671,  674,  660,
+      661,  663,  676,  666,  675,  667,  669,  670,  672,  672,
+      675,  677,  674,  679,  678,  673,  680,  677,  678,  681,
+      682,  684,  676,  689,  681,  683,  683,  684,  680,  686,
 
-      681,  677,  687,  677,  686,  689,  708,  688,  677,  686,
-      686,  688,  690,  677,  691,  692,  687,  690,  693,  691,
-      689,  694,  695,  702,  696,  708,  698,  690,  695,  692,
-      696,  698,  699,  699,  703,  694,  701,  702,  699,  693,
-      699,  701,  704,  704,  705,  706,  703,  707,  709,  705,
-      715,  699,  711,  706,  710,  710,  711,  713,  699,  714,
-      716,  707,  714,  713,  717,  719,  718,  709,  720,  715,
-      717,  718,  721,  716,  722,  725,  723,  720,  724,  727,
-      726,  721,  723,  728,  719,  726,  729,  724,  734,  730,
-      722,  731,  735,  737,  725,  732,  736,  728,  730,  727,
+      685,  687,  679,  685,  688,  691,  680,  690,  690,  694,
+      688,  682,  695,  689,  687,  692,  695,  686,  693,  693,
+      692,  696,  697,  691,  694,  699,  696,  702,  700,  703,
+      705,  705,  706,  707,  708,  709,  706,  710,  711,  709,
+      713,  697,  700,  711,  712,  713,  713,  702,  707,  699,
+      703,  704,  710,  715,  704,  714,  704,  715,  712,  708,
+      704,  716,  704,  717,  720,  718,  719,  704,  717,  714,
+      718,  722,  704,  721,  725,  723,  716,  722,  717,  725,
+      719,  723,  724,  724,  726,  720,  727,  721,  728,  728,
+      729,  731,  730,  737,  728,  736,  728,  730,  732,  733,
 
-      731,  732,  734,  746,  738,  739,  729,  740,  737,  738,
-      739,  735,  740,  741,  736,  742,  742,  743,  744,  746,
-      747,  749,  741,  743,  749,  747,  747,  750,  748,  748,
-      751,  744,  748,  752,  753,  754,  755,  756,  757,  755,
-      753,  750,  758,  757,  759,  762,  760,  758,  752,  761,
-      751,  760,  765,  764,  761,  754,  766,  762,  756,  764,
-      759,  768,  766,  767,  767,  769,  770,  771,  765,  770,
-      768,  772,  773,  774,  775,  779,  776,  777,  781,  782,
-      775,  776,  777,  769,  780,  771,  774,  780,  783,  781,
-      772,  786,  773,  779,  787,  784,  785,  782,  789,  787,
+      733,  734,  729,  726,  727,  731,  734,  728,  735,  736,
+      732,  738,  737,  744,  728,  740,  735,  739,  739,  740,
+      742,  743,  745,  746,  743,  748,  742,  749,  747,  746,
+      738,  750,  744,  747,  751,  745,  749,  752,  753,  754,
+      750,  755,  756,  752,  748,  757,  755,  753,  758,  761,
+      751,  759,  760,  763,  764,  761,  765,  766,  754,  757,
+      759,  760,  756,   64,  767,  768,  769,  763,  758,  767,
+      768,  769,  766,  764,  765,  770,  771,  771,  773,  772,
+      775,  776,  780,  779,  770,  772,  776,  776,  777,  777,
+      778,  773,  777,  778,  781,  782,  775,  779,  783,  785,
 
-      783,  784,  785,  788,  788,  790,  786,  792,  791,  793,
-      795,  792,  794,  796,  798,  802,  800,  789,  803,  790,
-      791,  794,  801,  805,  803,  804,  808,  793,  805,  795,
-      800,  804,  806,  798,  806,  802,  807,  801,  796,  809,
-      808,  807,  810,  811,  812,  813,  814,  810,  815,  816,
-      816,  817,  813,  809,  818,  820,  819,  134,  811,  823,
-      823,  814,  819,  812,  821,  817,  824,  815,  826,  821,
-      825,  824,  818,  827,  828,  820,  827,  825,  821,  829,
-      821,  830,  826,  821,  831,  832,  830,  833,  829,  837,
-      832,  836,  828,  835,  835,  836,  838,  839,  837,  840,
+      784,  782,  780,  784,  791,  786,  787,  788,  789,  781,
+      786,  787,  790,  789,  794,  793,  791,  790,  783,  795,
+      785,  793,  797,  788,  798,  795,  796,  796,  800,  799,
+      794,  797,  799,  801,  802,  803,  805,  804,  808,  806,
+      810,  805,  798,  804,  806,  811,  800,  809,  803,  812,
+      809,  810,  801,  813,  802,  815,  808,  816,  814,  813,
+      818,  812,  816,  811,  814,  817,  817,  819,  820,  821,
+      815,  822,  824,  821,  823,  825,  827,  828,  828,  818,
+      820,  819,  830,  823,  831,  832,  832,  833,  834,  822,
+       59,  824,  835,  843,  834,  827,  830,  836,  835,  831,
 
-      841,  842,  843,  831,  844,  845,  833,  841,  848,  846,
-      849,  838,  847,  842,  840,  846,  839,  850,  852,  853,
-      855,  843,  857,  845,  852,  844,  850,  847,  848,  854,
-      849,  856,  859,  853,  857,  860,  856,  854,  858,  861,
-      855,  862,  862,  858,  858,  865,  864,  867,  867,  860,
-      866,  859,  861,  863,  865,  868,  866,  873,  863,  864,
-      868,  863,  863,  870,  869,  871,  863,  876,  870,  874,
-      871,  877,  863,  869,  872,  872,  863,  873,  874,  875,
-      878,  876,  879,  881,  875,  880,  878,  881,  879,  877,
-      880,  882,  883,  883,  884,  885,  884,  887,  888,  889,
+      825,  837,  836,  837,  838,  839,  840,  833,  841,  838,
+      842,  844,  843,  841,  845,  846,  847,  847,  844,  839,
+      840,  848,  849,  851,  850,  842,  854,  854,  852,  845,
+      850,  855,  856,  852,  846,  848,  855,  857,  858,  856,
+      849,  858,  852,  851,  852,  859,  860,  852,  861,  862,
+      864,  857,  863,  861,  867,  860,  868,  863,  866,  866,
+      869,  868,  870,  859,  869,  871,  872,  873,  862,  864,
+      874,  870,  875,  876,  867,  877,  878,  874,  880,  881,
+      871,  879,  873,  882,  875,  872,  883,  879,  886,  888,
+      887,  885,  876,  880,  878,  883,  877,  885,  887,  881,
 
-      882,  887,  894,  890,  892,  882,  885,  882,  896,  882,
-      891,  882,  890,  888,  893,  891,  891,  889,  892,  895,
-      897,  894,  896,  893,  898,  897,  899,  895,  900,  901,
-      904,  902,  903,  903,  907,  899,  902,  907,  898,  905,
-      905,  909,  908,  910,  910,  904,  900,  908,  911,  912,
-      912,  913,  914,  918,  901,  916,  913,  915,  915,  917,
-      909,  918,  919,  922,  917,  920,  925,  919,  911,  924,
-      920,  921,  921,  914,  923,  916,  924,  927,  928,  925,
-      923,  922,  929,  927,  928,  930,  931,  929,  932,  933,
-      935,  930,  934,  934,  936,  931,  937,  938,  939,  941,
+      889,  890,  886,  882,  892,  889,  891,  893,  976,  888,
+      898,  891,  891,  890,  894,  895,  895,  897,  899,  898,
+      976,  893,  902,  892,  899,  900,  900,  894,  896,  901,
+      897,  902,  906,  896,  901,  903,  896,  896,  904,  907,
+      903,  896,  909,  904,  905,  905,  910,  896,  907,  908,
+      928,  896,  906,  911,  908,  912,  909,  913,  928,  911,
+      915,  912,  913,  914,  910,  916,  916,  914,  917,  915,
+      917,  918,  921,  920,  915,  922,  915,  920,  915,  923,
+      915,  925,  918,  926,  924,  927,  929,  921,  923,  924,
+      924,  930,  926,  922,  931,  925,  930,  932,  933,  934,
 
-      933,  940,  942,  938,  943,  944,  944,  932,  945,  946,
-      935,  941,  939,  947,  936,  948,  942,  950,  939,  937,
-      948,  940,  943,  949,  949,  951,  953,  954,  945,  955,
-      951,  947,  954,  954,  946,  956,  957,  958,  955,  959,
-      950,  960,  961,  956,  961,  953,  960,  962,  967,  960,
-      957,  964,  958,  963,  959,  964,  965,  959,  966,  963,
-      968,  962,  970,  969,  971,  973,  975,  965,  969,  973,
-      974,  976,  977,  980,  967,  978,  979,  966,  968,  984,
-      970,  989,  981,  976,  971,  975,  977,  981,  974,  982,
-      978,  979,  980,  983,  985,  987,  982,  984,  983,  986,
+      929,   54,  935,  937,  927,  944,  932,  935,  931,  936,
+      936,  938,  938,  942,  940,  941,  933,  940,  937,  947,
+      941,  943,  943,  946,  934,  944,  945,  945,  946,  948,
+      948,  949,  942,  950,  951,  955,  952,  956,  950,  953,
+      947,  952,  951,  956,  953,  954,  954,  957,  958,  960,
+      961,  949,  962,  955,  957,  960,  961,  962,  963,  964,
+      965,  958,  966,  968,  963,  967,  967,  970,  964,  971,
+      973,  974,  977,  966,  975,  978,  973,  979,  979,  965,
+      980,  981,  985,  968,  982,  974,  977,  970,  984,  984,
+      983,  974,  971,  978,  975,  983,  986,  988,  989,  990,
 
-      986,  988,  989,  985,  990,  991,  992,  988,  999,  990,
-      987,  991,  992,  993,  993,  994,  994,  996,  996,  997,
-      998, 1000, 1001,  997, 1002, 1004,  999, 1003, 1003,  998,
-     1005, 1002, 1007, 1008, 1006, 1000, 1009, 1001, 1005, 1006,
-     1011, 1009, 1009, 1010, 1012, 1004, 1007, 1013, 1010, 1010,
-     1014, 1015, 1008, 1016, 1017, 1018, 1019, 1015, 1020, 1021,
-     1011, 1018, 1019, 1012, 1022, 1023, 1013, 1024, 1025, 1014,
-     1026, 1027, 1027, 1017, 1029, 1030, 1030, 1020, 1021, 1016,
-       69, 1024, 1038, 1022, 1023, 1026, 1029, 1028, 1031, 1025,
-     1028, 1032, 1033, 1031, 1034, 1032, 1035, 1039, 1036, 1044,
+      980,  986,  982,  989,  989,  985,  981,  991,  990,  992,
+      993,  994,  995,  997, 1002,  991,  988,  995,  998,  996,
+      995,  996, 1000,  992,  998,  993,  994,  997,  999,  994,
+     1001, 1004,  999, 1000, 1003, 1005, 1004, 1006, 1008, 1010,
+     1002, 1009, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1001,
+     1016, 1017, 1003, 1005, 1018, 1021, 1008, 1006, 1013, 1018,
+     1019, 1014, 1011, 1015, 1012, 1016, 1020, 1019, 1022, 1024,
+     1017, 1020, 1025, 1021, 1023, 1023, 1026, 1022, 1025, 1034,
+     1027, 1028, 1029, 1034, 1024, 1027, 1035, 1028, 1029, 1030,
+     1030, 1031, 1031, 1033, 1033, 1035, 1036, 1026, 1037, 1039,
 
-     1036, 1046, 1038, 1034, 1036, 1033, 1040, 1040, 1042, 1035,
-     1041, 1045, 1042, 1039, 1043, 1041, 1047, 1036, 1043, 1044,
-     1050, 1046, 1047, 1048, 1048, 1052, 1053, 1053, 1054, 1045,
-     1052, 1056, 1056, 1059, 1054, 1058, 1058, 1061, 1050, 1063,
-     1061, 1062, 1062, 1064, 1065, 1065, 1066, 1067, 1068, 1059,
-     1069, 1069, 1067, 1070, 1063, 1071, 1073, 1070, 1072, 1072,
-     1066, 1074, 1075, 1068, 1076, 1077, 1075, 1080, 1064, 1084,
-     1077, 1085, 1074, 1079, 1079, 1071, 1081, 1083, 1073, 1082,
-     1082, 1087, 1083, 1076, 1086, 1080, 1087, 1088, 1092, 1084,
-     1081, 1085, 1089, 1086, 1089, 1090, 1091, 1093, 1095, 1097,
+     1038, 1040, 1040, 1041, 1043, 1042, 1039, 1044, 1045, 1043,
+     1048, 1046, 1037, 1042, 1036, 1038, 1046, 1046, 1049, 1047,
+     1050, 1044, 1051, 1041, 1047, 1047, 1052, 1045, 1053, 1054,
+     1048, 1057, 1052, 1058, 1055, 1061, 1056, 1049, 1059, 1050,
+     1055, 1051, 1056, 1060, 1062, 1063, 1064, 1064, 1054, 1061,
+     1057, 1066, 1058, 1065, 1053, 1075, 1065, 1059, 1067, 1067,
+     1063, 1068, 1060, 1066, 1069, 1062, 1068, 1070, 1069, 1071,
+     1072, 1073, 1076, 1073, 1078, 1075, 1081, 1073, 1071, 1078,
+     1070, 1077, 1077, 1072, 1082, 1079, 1083, 1080, 1076, 1079,
+     1073, 1080, 1084, 1085, 1085, 1087, 1081, 1091, 1084, 1089,
 
-     1090, 1100, 1091, 1093, 1096, 1096, 1103, 1088, 1092, 1098,
-     1101, 1101, 1095, 1102, 1102, 1098, 1104, 1105, 1097, 1106,
-     1103, 1108, 1106, 1107, 1107, 1100, 1109, 1115, 1118, 1118,
-     1111, 1113, 1105, 1108, 1104, 1110, 1111, 1112, 1110, 1114,
-     1113, 1110, 1112, 1117, 1114, 1116, 1109, 1119, 1116, 1117,
-     1120, 1121, 1115, 1110, 1122, 1125, 1123, 1124, 1129, 1126,
-     1122, 1123, 1130, 1124, 1126, 1119, 1127, 1127, 1128, 1120,
-     1131, 1121, 1132, 1128, 1133, 1134, 1129, 1136, 1125, 1135,
-     1137, 1138, 1130, 1136, 1139, 1140, 1132, 1134, 1133, 1143,
-     1131, 1144, 1135, 1142, 1142, 1146, 1144, 1147, 1139, 1148,
+     1090, 1090, 1082, 1091, 1089, 1096, 1083, 1093, 1093, 1095,
+     1095, 1098, 1100, 1087, 1098, 1099, 1099, 1101, 1102, 1102,
+     1103, 1096, 1105, 1104, 1106, 1106, 1107, 1100, 1104, 1108,
+     1107, 1109, 1109, 1110, 1103, 1111, 1112, 1105, 1113, 1114,
+     1112, 1117, 1101, 1121, 1114, 1122, 1111, 1116, 1116, 1108,
+     1118, 1119, 1119, 1120, 1125, 1110, 1124, 1113, 1120, 1117,
+     1123, 1124, 1127, 1121, 1118, 1122, 1126, 1127, 1126, 1123,
+     1128, 1129, 1130, 1132, 1125, 1134, 1128, 1135, 1130, 1133,
+     1133, 1137, 1140, 1135, 1138, 1138, 1141, 1132, 1139, 1139,
+     1143, 1129, 1142, 1143, 1134, 1146, 1140, 1144, 1144, 1145,
 
-     1137, 1138, 1145, 1145, 1149, 1150, 1140, 1153, 1152, 1143,
-     1146, 1147, 1151, 1154, 1150, 1152, 1153, 1156, 1158, 1153,
-     1159, 1159, 1149, 1148, 1160, 1160, 1162, 1151, 1161, 1154,
-     1163, 1161, 1156, 1164, 1166, 1163, 1169, 1156, 1165, 1167,
-     1171, 1168, 1169, 1158, 1172, 1162, 1173, 1165, 1167, 1164,
-     1168, 1167, 1174, 1166, 1170, 1170, 1175, 1172, 1176, 1178,
-     1171, 1179, 1180, 1180, 1173, 1181, 1174, 1182, 1183, 1186,
-     1176, 1185, 1175, 1183, 1184, 1184, 1182, 1190,   63, 1179,
-     1185, 1181, 1189, 1185, 1178, 1187, 1197, 1186, 1189, 1184,
-     1187, 1187, 1191, 1191, 1192, 1190, 1193, 1194, 1195, 1198,
+     1147, 1150, 1148, 1147, 1141, 1137, 1147, 1142, 1148, 1149,
+     1150, 1145, 1151, 1152, 1149, 1146, 1153, 1151, 1147, 1153,
+     1154, 1155, 1155, 1156, 1157, 1158, 1154, 1159, 1156, 1160,
+     1161, 1164, 1166, 1166, 1162, 1163, 1161, 1157, 1152, 1162,
+     1165, 1163, 1167, 1158, 1168, 1165, 1159, 1167, 1169, 1160,
+     1170, 1171, 1172, 1175, 1164, 1173, 1174, 1176, 1177, 1175,
+     1178, 1179, 1168, 1181, 1181, 1171, 1172, 1173, 1169, 1174,
+     1170, 1182, 1184, 1184, 1178, 1183, 1186, 1176, 1177, 1185,
+     1183, 1187, 1179, 1188, 1189, 1190, 1193, 1192, 1191, 1195,
+     1186, 1182, 1197, 1189, 1185, 1191, 1192, 1198, 1198, 1192,
 
-     1192, 1193, 1199, 1194, 1195, 1198, 1197, 1200, 1203, 1204,
-     1200, 1205, 1206, 1207, 1209, 1199, 1200, 1204, 1208, 1210,
-     1209, 1211, 1213, 1213, 1205, 1214,   58, 1203, 1220, 1215,
-     1206, 1208, 1207, 1215, 1224, 1210, 1216, 1217, 1218, 1211,
-     1219, 1216, 1217, 1218, 1222, 1214, 1223, 1223, 1224, 1219,
-     1225, 1220, 1226, 1227, 1228, 1229, 1230, 1225, 1231, 1222,
-     1232, 1233, 1230, 1235, 1226, 1227, 1235, 1233, 1234, 1234,
-     1231, 1236, 1236, 1228, 1238, 1229, 1239, 1241, 1232, 1238,
-     1240, 1240, 1242, 1243, 1242, 1239, 1243, 1244, 1245, 1241,
-     1246, 1247, 1248, 1249, 1250, 1252, 1251, 1248, 1254, 1255,
+     1190, 1188, 1193, 1201, 1195, 1187, 1199, 1199, 1200, 1195,
+     1202, 1200, 1203, 1205, 1204, 1202, 1207, 1197, 1206, 1210,
+     1208, 1213, 1201, 1204, 1211, 1207, 1208, 1206, 1203, 1212,
+     1206, 1215, 1205, 1209, 1209, 1213, 1214, 1211, 1217, 1210,
+     1218, 1219, 1219, 1215, 1220, 1221, 1222, 1212, 1225, 1223,
+     1223, 1222, 1214, 1224, 1221, 1228, 1229,   53, 1218, 1236,
+     1220, 1228, 1224, 1217, 1223, 1224, 1225, 1226, 1230, 1230,
+     1231, 1233, 1226, 1226, 1229, 1232, 1231, 1233, 1234, 1236,
+     1232, 1237, 1238, 1239, 1234, 1242, 1239, 1237, 1243, 1244,
+     1245, 1246, 1239, 1247, 1248, 1238, 1243, 1249, 1250, 1253,
 
-     1252, 1258, 1249, 1253, 1256, 1256, 1250, 1244, 1246, 1247,
-     1245, 1251, 1253, 1257, 1255, 1259, 1260, 1262, 1254, 1257,
-     1261, 1261, 1258, 1263, 1263, 1253, 1264, 1265, 1265, 1266,
-     1271, 1273, 1267, 1266, 1259, 1270, 1260, 1262, 1267, 1268,
-     1272, 1270, 1268, 1275, 1275, 1279, 1272, 1264, 1271, 1274,
-     1276, 1276, 1274, 1277, 1278, 1280, 1273, 1281, 1282, 1277,
-     1285, 1287, 1292, 1281, 1284, 1279, 1278, 1278, 1278, 1284,
-     1284, 1288, 1287, 1278, 1285, 1280, 1289, 1286, 1282, 1286,
-     1290, 1291, 1289, 1292, 1293, 1293, 1288, 1294, 1296, 1290,
-     1295, 1295, 1297, 1298, 1298, 1299, 1299, 1302, 1303, 1304,
+     1248, 1254, 1244, 1259, 1242, 1254, 1247,   48, 1245, 1255,
+     1246, 1252, 1252, 1249, 1255, 1256, 1250, 1257, 1258, 1253,
+     1256, 1261, 1257, 1262, 1262, 1263, 1259, 1258, 1264, 1265,
+     1266, 1267, 1268, 1270, 1269, 1264, 1261, 1271, 1272, 1263,
+     1269, 1265, 1266,   43, 1272, 1270, 1273, 1273, 1274, 1278,
+     1267, 1274, 1268, 1275, 1275, 1271, 1277, 1280, 1278, 1279,
+     1279, 1277, 1281, 1282, 1281, 1283, 1282, 1284, 1285, 1280,
+     1286, 1287, 1288, 1291, 1292, 1289, 1287, 1290, 1291, 1293,
+     1294, 1288, 1297, 1292, 1299, 1283, 1285, 1289, 1286, 1284,
+     1295, 1295, 1290, 1298, 1296, 1294, 1292, 1300, 1300, 1293,
 
-     1304, 1291, 1305, 1306, 1308, 1310, 1302, 1307, 1296, 1311,
-     1306, 1309, 1309, 1294, 1297, 1313, 1307, 1305, 1314, 1303,
-     1313, 1315, 1316, 1320, 1314, 1311, 1317, 1318, 1320, 1316,
-     1308, 1310, 1317, 1318, 1319, 1319, 1321, 1322, 1324, 1323,
-     1325, 1315, 1326, 1325, 1327, 1321, 1328, 1328, 1329, 1330,
-     1324, 1333, 1332, 1330, 1335, 1336, 1337, 1322, 1323, 1336,
-     1326, 1340, 1337, 1329, 1342, 1338, 1333, 1339, 1339, 1330,
-     1327, 1332, 1340, 1335, 1338, 1341, 1341, 1340, 1343, 1344,
-     1345, 1346, 1346, 1347, 1348, 1342, 1345, 1349, 1347, 1347,
-     1348, 1350, 1343, 1349, 1351, 1352, 1354, 1356, 1355, 1344,
+     1296, 1301, 1301, 1297, 1299, 1302, 1302, 1303, 1304, 1304,
+     1305, 1307, 1298, 1306, 1306, 1307, 1308, 1309, 1311, 1312,
+     1309, 1314, 1308, 1313, 1311, 1315, 1319, 1303, 1315, 1313,
+     1318, 1305, 1316, 1316, 1317, 1317, 1318, 1312, 1319, 1319,
+     1319, 1320, 1321, 1322, 1323, 1319, 1314, 1325, 1327, 1322,
+     1327, 1326, 1325, 1325, 1329, 1328, 1332, 1330, 1331, 1333,
+     1335, 1320, 1321, 1330, 1323, 1326, 1328, 1331, 1337, 1329,
+     1334, 1334, 1336, 1336, 1338, 1343, 1332, 1339, 1339, 1344,
+     1333, 1340, 1340, 1346, 1343, 1347, 1335, 1349, 1337, 1345,
+     1345, 1351, 1347, 1348, 1350, 1350, 1338, 1355, 1346, 1352,
 
-     1357, 1352, 1355, 1361, 1358, 1359, 1351, 1360, 1354, 1356,
-     1358, 1363, 1367, 1360, 1363, 1361,   53, 1350, 1364, 1364,
-     1365, 1365, 1366, 1366, 1368, 1357, 1370, 1359, 1369, 1371,
-     1368, 1370, 1367, 1372, 1369, 1371, 1374, 1376, 1377, 1379,
-     1376, 1374, 1372, 1380, 1381, 1382, 1382, 1383, 1384, 1381,
-     1377, 1379, 1385, 1384, 1387, 1380, 1383, 1385, 1386, 1386,
-     1388, 1389, 1390, 1391, 1394, 1392, 1393, 1391, 1397, 1388,
-     1392, 1398, 1393, 1399, 1387, 1396, 1396, 1403, 1394, 1389,
-     1398, 1390, 1399, 1401, 1401, 1405, 1397, 1396, 1406, 1407,
-     1408, 1409, 1409, 1403, 1410, 1407, 1410, 1411, 1411, 1414,
+     1344, 1354, 1348, 1355, 1356, 1357, 1354, 1363, 1358, 1364,
+     1359, 1365, 1357, 1349, 1358, 1352, 1359, 1351, 1360, 1360,
+     1361, 1362, 1367, 1365, 1356, 1361, 1366, 1363, 1364, 1366,
+     1362, 1368, 1369, 1369, 1370, 1371, 1374, 1373, 1377, 1371,
+     1367, 1376, 1377, 1379, 1378, 1380, 1380, 1381, 1383, 1370,
+     1378, 1374, 1379, 1382, 1382, 1371, 1373, 1368, 1381, 1384,
+     1376, 1385, 1386, 1381, 1387, 1387, 1388, 1391, 1386, 1383,
+     1389, 1388, 1388, 1384, 1390, 1392, 1389, 1393, 1395, 1397,
+     1390, 1385, 1396, 1393, 1398, 1400, 1396, 1392, 1399, 1401,
+     1395, 1397, 1402, 1391, 1399, 1401, 1404, 1405, 1405, 1404,
 
-     1405, 1412, 1406, 1415, 1416, 1416, 1414, 1408, 1417, 1412,
-     1418, 1422, 1419, 1420, 1421, 1423, 1424, 1417, 1426,   52,
-     1427, 1429, 1424, 1415, 1419, 1420, 1421, 1428, 1428, 1430,
-     1423, 1418, 1427, 1431, 1433, 1424, 1431, 1422, 1426, 1429,
-     1432, 1435, 1436, 1437, 1436, 1432, 1435, 1438, 1439, 1430,
-     1441, 1442, 1438, 1442, 1433, 1439, 1444, 1445, 1445, 1441,
-     1446, 1437, 1447, 1448, 1449, 1448, 1450, 1447, 1452, 1449,
-     1444, 1450, 1451, 1453, 1455, 1454, 1456, 1458, 1459, 1453,
-     1454, 1460, 1460, 1462, 1456, 1463, 1446, 1455, 1452, 1464,
-     1451, 1467, 1459, 1461, 1461, 1464, 1458, 1465, 1462, 1466,
+     1406, 1406, 1407, 1407, 1402, 1408, 1409, 1400, 1410, 1398,
+     1411, 1412, 1409, 1413, 1410, 1411, 1415, 1412, 1418, 1420,
+     1417, 1415, 1413, 1417, 1421, 1408, 1424, 1422, 1423, 1423,
+     1418, 1420, 1422, 1425, 1426, 1424, 1421, 1428, 1425, 1426,
+     1427, 1427, 1429, 1430, 1431, 1432, 1435, 1433, 1434, 1432,
+     1438, 1429, 1433, 1439, 1434, 1437, 1437, 1428, 1441, 1446,
+     1435, 1430, 1439, 1431, 1440, 1444, 1444, 1437, 1438, 1448,
+     1450, 1441, 1449, 1440, 1451, 1446, 1450, 1452, 1452, 1453,
+     1455, 1453, 1454, 1454, 1448, 1457, 1449, 1458, 1455, 1459,
+     1459, 1451, 1457, 1460, 1461, 1465, 1462, 1463, 1464, 1466,
 
-     1472, 1466, 1465, 1467, 1470, 1463, 1468, 1468, 1469, 1469,
-     1471, 1474, 1471, 1470, 1473, 1473, 1470, 1475, 1477, 1478,
-     1474, 1472, 1480, 1477, 1478, 1481, 1482, 1483, 1485, 1475,
-     1487, 1488, 1490, 1489, 1485, 1480, 1487, 1491, 1492, 1492,
-     1493, 1494, 1494, 1483, 1482, 1481, 1491, 1485, 1489, 1493,
-     1495, 1496, 1498, 1497, 1488, 1496, 1499, 1490, 1497, 1500,
-     1501, 1499, 1499, 1504, 1504, 1498, 1506, 1500, 1521, 1495,
-     1505, 1505, 1507, 1507, 1509, 1506, 1508, 1508, 1511, 1510,
-     1501, 1518, 1512, 1523, 1511, 1505, 1509, 1512, 1513, 1513,
-     1514, 1532, 1515, 1521, 1524, 1514, 1505, 1510, 1515, 1517,
+     1467, 1470, 1460, 1469, 1471, 1471, 1467, 1458, 1462, 1463,
+     1464, 1472, 1473, 1470, 1466, 1461, 1476, 1474, 1489, 1467,
+     1474, 1465, 1475, 1469, 1479, 1478, 1479, 1475, 1480, 1472,
+     1478, 1484, 1473, 1481, 1482, 1485, 1476, 1485, 1481, 1487,
+     1484, 1482, 1488, 1488, 1489, 1490, 1480, 1491, 1494, 1491,
+     1490, 1492, 1493, 1487, 1495, 1496, 1492, 1493, 1497, 1498,
+     1499, 1496, 1501, 1497, 1502, 1505, 1494, 1506, 1499, 1503,
+     1503, 1507, 1498,   14, 1495, 1504, 1504, 1507, 1502, 1508,
+     1505, 1501, 1510, 1509, 1508, 1509, 1513, 1506, 1511, 1511,
+     1512, 1512, 1515, 1517, 1510, 1513, 1518, 1514, 1513, 1514,
 
-     1519, 1518, 1522, 1517, 1519, 1525, 1523, 1522, 1526, 1524,
-     1525, 1527, 1528, 1528, 1529, 1530, 1531, 1532, 1529, 1533,
-     1535, 1531, 1536, 1537, 1538, 1539, 1526, 1527, 1540, 1541,
-     1530, 1544, 1544, 1543, 1545, 1595, 1546, 1545, 1533, 1535,
-     1540, 1547, 1595, 1538, 1548, 1536, 1539, 1537, 1543, 1546,
-     1541, 1549, 1549, 1550, 1550, 1547, 1552, 1548, 1551, 1551,
-     1553, 1554, 1554, 1555, 1556, 1556, 1560, 1561, 1562, 1557,
-     1565, 1552, 1555, 1553, 1557, 1555, 1559, 1563, 1563, 1567,
-     1562, 1559, 1564, 1564, 1566, 1566, 1560, 1561, 1570, 1565,
-     1568, 1568, 1569, 1569, 1571, 1573, 1575, 1567, 1574, 1574,
+     1516, 1516, 1517, 1523, 1520, 1521, 1524, 1525, 1518, 1520,
+     1521, 1526, 1528, 1515, 1530, 1531, 1523, 1532, 1528, 1533,
+     1530, 1534, 1535, 1535, 1536, 1525, 1524, 1526, 1537, 1537,
+     1534, 1528, 1532, 1536, 1538, 1539, 1540, 1541, 1531, 1539,
+     1542, 1540, 1544, 1543, 1533, 1542, 1542, 1547, 1547, 1549,
+     1541, 1543, 1552, 1538, 1548, 1548, 1550, 1550, 1549, 1551,
+     1551, 1553, 1544, 1555, 1552, 1554, 1556, 1556, 1555, 1548,
+     1557, 1554, 1558, 1560, 1561, 1557, 1564, 1560, 1558, 1553,
+     1548, 1562, 1565, 1566, 1567, 1562, 1568, 1565, 1570, 1569,
+     1573, 1568, 1571, 1571, 1561, 1575, 1572, 1574, 1576, 1567,
 
-     1573, 1577, 1570, 1576, 1576, 1578, 1579, 1580, 1580, 1579,
-     1582, 1578, 1583, 1571, 1584, 1575, 1581, 1581, 1587, 1577,
-     1585, 1585, 1588, 1580, 1589, 1592, 1590, 1583, 1594, 1582,
-     1590, 1591, 1591, 1584, 1593, 1593, 1596, 1598, 1587, 1589,
-     1597, 1597, 1601, 1603, 1592, 1588, 1598, 1599, 1594, 1599,
-     1602, 1604, 1605, 1606, 1601, 1602, 1607, 1608, 1606,   47,
-     1609, 1607, 1596, 1613, 1604, 1610, 1611, 1612, 1603, 1609,
-     1617, 1619, 1608, 1605, 1610, 1611, 1612, 1613, 1614, 1615,
-     1619, 1620, 1620, 1615, 1614, 1621, 1622, 1622, 1623, 1625,
-     1617, 1621, 1626, 1628, 1630, 1622, 1629, 1633, 1634, 1631,
+     1572, 1564, 1574, 1579, 1570, 1573, 1566, 1569, 1577, 1577,
+     1580, 1581, 1582, 1583, 1584, 1585, 1590, 1576, 1588, 1588,
+     1606, 1575, 1579, 1587, 1589, 1591, 1584, 1589, 1592, 1590,
+       13, 1582, 1606, 1580, 1583, 1581, 1585, 1596, 1587, 1591,
+     1597, 1592, 1593, 1593, 1594, 1594, 1595, 1595, 1598, 1598,
+     1599, 1601, 1596, 1597, 1600, 1600, 1601, 1604, 1603, 1599,
+     1605, 1611, 1599, 1603, 1607, 1607, 1608, 1608, 1609, 1610,
+     1610, 1612, 1612, 1613, 1613, 1614, 1615, 1604, 1617, 1611,
+     1605, 1618, 1618, 1617, 1619, 1620, 1620, 1609, 1621, 1614,
+     1622, 1623, 1624, 1624, 1623, 1615, 1622, 1625, 1625, 1626,
 
-     1633, 1626, 1635, 1634, 1625, 1628, 1636,   42, 1623, 1630,
-     1623, 1631, 1629, 1637, 1637, 1639, 1639, 1640, 1636, 1641,
-     1640, 1642, 1635, 1643, 1641, 1644, 1644, 1642, 1645, 1643,
-     1646, 1646, 1647, 1648, 1649, 1650, 1650, 1652, 1654, 1654,
-     1653, 1652, 1645, 1653, 1647, 1655, 1656, 1648, 1657, 1658,
-     1655, 1659, 1660, 1649, 1661, 1659, 1662, 1664, 1663, 1661,
-     1666, 1668, 1662, 1658, 1663, 1667, 1656, 1668, 1657, 1669,
-     1667, 1670, 1660, 1670, 1673, 1664, 1666, 1669, 1674, 1674,
-     1675, 1676, 1679, 1675, 1677, 1677, 1679, 1680, 1673, 1681,
-     1682, 1682, 1688, 1680, 1683, 1686, 1686, 1691, 1699, 1692,
+     1627, 1628, 1631, 1619, 1629, 1629, 1621, 1632, 1624, 1633,
+     1634, 1635, 1635, 1636, 1634, 1627, 1637, 1637, 1626, 1638,
+     1628, 1639, 1631, 1640, 1633, 1641, 1641, 1642, 1639, 1643,
+     1632, 1643, 1636, 1645, 1647, 1646, 1642, 1648, 1650, 1638,
+     1646, 1649, 1651, 1650, 1653, 1645, 1652, 1651, 1654, 1640,
+     1648, 1655, 1657, 1653, 1656, 1661,    0, 1654, 1658, 1647,
+     1655, 1652, 1649, 1656, 1658, 1659, 1657, 1663, 1665, 1659,
+     1664, 1664, 1666, 1666, 1665, 1661, 1663, 1667, 1669, 1670,
+     1672, 1666, 1673, 1675, 1677, 1674, 1678, 1677, 1670, 1679,
+     1680, 1678, 1672, 1669,    0, 1675, 1685, 1667, 1673, 1667,
 
-     1700, 1681, 1691, 1683, 1692, 1693, 1693, 1676, 1695, 1695,
-     1688, 1697, 1698, 1698, 1699, 1701, 1703, 1697, 1704, 1707,
-     1701, 1708, 1700, 1705, 1705, 1709, 1710, 1708, 1707,   14,
-     1704, 1712, 1712, 1714, 1714, 1703, 1715, 1715, 1717, 1716,
-     1717, 1710, 1718, 1709, 1716, 1719, 1720, 1721, 1721, 1722,
-     1722, 1720, 1723, 1723, 1724, 1725, 1718, 1726, 1726, 1719,
-     1727, 1729, 1728, 1730, 1731, 1732, 1724, 1733, 1729, 1735,
-     1732, 1736, 1727, 1725, 1728, 1730, 1734, 1734, 1735, 1737,
-     1738, 1739, 1740, 1742, 1731, 1741, 1741, 1733, 1743, 1744,
-     1745, 1746, 1742, 1738, 1746, 1747, 1740, 1736, 1748, 1737,
+     1674, 1685, 1680, 1681, 1681, 1683, 1683, 1684, 1686, 1679,
+     1684, 1687, 1688, 1688, 1686, 1689, 1691, 1687, 1690, 1690,
+     1692, 1693, 1694, 1694, 1697, 1700, 1696, 1697, 1691, 1689,
+     1696, 1698, 1698, 1699, 1692, 1702, 1703, 1704, 1699, 1705,
+     1693, 1704, 1706, 1707, 1709, 1700, 1708, 1706, 1711, 1707,
+     1703, 1712, 1708, 1714, 1713, 1702, 1712, 1718, 1721, 1705,
+     1713, 1714, 1709, 1715, 1711, 1715, 1719, 1719, 1726, 1720,
+     1725, 1718, 1720, 1722, 1722, 1724, 1725, 1727, 1727, 1724,
+     1726, 1728, 1731, 1731, 1721, 1733, 1736, 1737, 1738, 1738,
+     1728, 1736, 1737, 1740, 1740, 1742, 1743, 1743, 1744, 1745,
 
-     1750, 1750, 1749, 1748, 1756, 1739, 1743, 1749, 1758, 1747,
-     1757, 1744, 1760, 1745, 1751, 1751, 1752, 1752, 1755, 1755,
-     1761, 1757, 1756, 1762, 1763, 1764, 1765, 1758, 1770, 1766,
-     1767, 1767, 1760, 1771, 1764, 1769, 1769, 1770, 1761, 1773,
-     1774, 1772, 1775, 1776, 1763, 1762, 1765, 1766, 1772, 1777,
-     1782, 1771, 1778, 1778, 1773, 1779, 1779, 1780, 1774, 1776,
-     1775, 1781, 1783, 1780, 1784, 1782, 1785, 1786, 1777, 1784,
-     1787, 1788, 1790, 1788, 1790, 1787, 1789, 1789, 1793, 1781,
-     1795, 1783, 1791, 1791, 1796, 1800, 1785, 1786, 1797, 1795,
-     1801, 1802, 1802, 1801, 1803, 1804, 1806, 1793, 1805, 1805,
+     1746, 1742, 1752, 1733, 1748, 1746, 1749, 1750, 1750, 1753,
+     1754, 1752, 1755,    0, 1744, 1753, 1757, 1757, 1749, 1759,
+     1759, 1745, 1763, 1748, 1760, 1760, 1761, 1755, 1754, 1764,
+     1762, 1761, 1762, 1765, 1766, 1766, 1763, 1769, 1765, 1767,
+     1767, 1768, 1768, 1764, 1770, 1771, 1771, 1772, 1773, 1769,
+     1774, 1775, 1776, 1777, 1778, 1779, 1779, 1774, 1777, 1772,
+     1773, 1780, 1770, 1775, 1781, 1782, 1783, 1784, 1785, 1787,
+     1780, 1788, 1776, 1789, 1778, 1786, 1786, 1790, 1787, 1783,
+     1791, 1793, 1785, 1791, 1792, 1782, 1793, 1794, 1801, 1788,
+     1781, 1784, 1794, 1795, 1795, 1789, 1796, 1796, 1792, 1802,
 
-     1806, 1808, 1809, 1816, 1796, 1800, 1809, 1797, 1811, 1803,
-     1810, 1810, 1824, 1804, 1813, 1813, 1808, 1815, 1815, 1817,
-     1817, 1811, 1816, 1818, 1819, 1819, 1823, 1823, 1818, 1825,
-     1826, 1827, 1828, 1829, 1824, 1830, 1827, 1831, 1829, 1826,
-     1832,   13, 1825, 1830, 1834, 1835, 1828, 1836, 1832, 1837,
-     1835, 1845, 1836, 1838, 1838, 1840, 1831, 1839, 1839, 1834,
-     1841, 1842, 1840, 1843, 1837, 1841, 1845, 1842, 1843, 1844,
-     1844, 1846, 1847, 1847, 1848, 1848, 1846, 1851, 1852, 1853,
-     1856, 1852, 1854, 1855, 1853, 1853, 1856, 1854, 1855, 1857,
-     1851, 1858, 1859, 1857, 1860, 1861, 1858, 1862, 1863, 1867,
+     1790, 1797, 1797, 1800, 1800, 1803, 1801, 1805, 1806, 1807,
+     1802, 1809, 1808, 1810, 1812, 1812, 1811, 1814, 1814, 1815,
+     1809, 1816, 1817, 1818, 1803, 1819, 1806, 1805, 1815, 1817,
+     1820, 1807, 1808, 1810, 1811, 1821, 1822, 1828, 1818, 1816,
+     1823, 1823, 1826, 1819, 1824, 1824, 1825, 1827, 1820, 1829,
+     1830, 1821, 1825, 1831, 1829, 1822, 1828, 1833, 1832, 1833,
+     1826, 1838, 1827, 1832, 1834, 1834, 1835, 1840, 1835, 1841,
+     1830, 1836, 1836, 1831, 1842, 1845, 1840, 1848, 1846, 1849,
+     1838, 1846, 1847, 1847, 1850, 1850, 1851, 1853, 1856, 1841,
+     1851, 1861, 1848, 1842, 1854, 1845, 1869, 1849, 1854, 1855,
 
-     1866, 1859, 1862, 1861, 1865, 1866, 1868, 1865, 1875, 1860,
-     1863, 1869, 1870, 1871, 1871, 1872, 1876, 1867, 1877, 1868,
-     1869, 1870, 1878, 1878, 1872, 1879, 1880, 1875, 1881, 1882,
-     1882, 1883, 1885, 1887, 1888, 1880, 1876, 1877, 1888, 1889,
-     1890, 1890, 1895, 1881, 1879, 1889, 1891, 1885, 1894, 1898,
-     1883, 1892, 1899, 1887, 1891, 1895, 1892, 1894, 1897, 1901,
-     1901, 1906, 1897, 1898, 1904, 1904, 1908, 1899, 1909, 1909,
-     1910, 1910, 1911, 1912, 1912, 1911, 1913, 1913, 1914, 1914,
-     1915, 1906, 1916, 1916, 1917, 1918, 1908, 1919, 1920, 1920,
-     1921, 1924, 1925, 1919, 1921, 1915, 1924, 1924, 1926, 1918,
+     1855, 1856, 1853, 1858, 1858, 1860, 1860, 1862, 1862, 1863,
+     1861, 1864, 1864, 1870, 1863, 1868, 1868, 1872, 1869, 1871,
+     1873, 1876, 1872, 1875, 1874, 1877, 1870, 1879, 1871, 1874,
+     1880, 1875, 1881, 1877, 1873, 1880, 1882, 1881, 1883, 1883,
+     1876, 1885, 1879, 1884, 1884, 1886, 1887, 1890, 1885, 1888,
+     1886, 1882, 1887, 1891, 1888, 1889, 1889, 1896, 1891, 1892,
+     1892, 1898, 1890, 1893, 1893, 1897, 1898, 1898, 1897, 1899,
+     1896, 1900, 1901, 1902, 1899, 1903, 1900, 1902, 1901, 1904,
+     1903, 1905, 1906, 1908, 1907, 1912, 1913, 1911, 1904, 1907,
+     1906, 1910, 1911, 1914, 1910, 1908, 1905, 1915, 1917, 1913,
 
-     1927, 1928, 1917, 1929, 1926, 1933, 1927, 1929, 1930, 1930,
-     1933, 1934, 1937, 1935, 1938, 1925, 1935, 1938, 1939, 1934,
-     1940, 1941, 1942, 1946, 1943, 1940, 1928, 1944, 1944, 1945,
-     1947, 1946, 1948, 1948, 1951, 1939, 1939, 1937, 1943, 1941,
-     1949, 1949, 1942, 1950, 1950, 1953, 1952, 1954, 1945, 1947,
-     1951, 1952, 1955, 1961, 1956, 1957, 1959, 1959, 1969, 1960,
-     1964, 1955, 1960, 1963, 1963, 1953,    0, 1964, 1965, 1965,
-     1967, 1961, 1966, 1954, 1956, 1957, 1969, 1966, 1971, 1967,
-     1970, 1970, 1971, 1972, 1973, 1974, 1976, 1975, 1978, 1978,
-     1974, 1974, 1972, 1979, 1980, 1976, 1982, 1984, 1986, 1973,
+     1916, 1916, 1914, 1912, 1920, 1921, 1915, 1917, 1922, 1923,
+     1923, 1924, 1925, 1926, 1927, 1927, 1928, 1930, 1932,    0,
+     1933, 1925, 1942, 1920, 1933, 1921, 1942, 1922, 1926, 1940,
+     1924, 1934, 1930, 1935, 1935, 1928, 1936, 1934, 1932, 1939,
+     1937, 1943, 1940, 1944, 1936, 1937, 1946, 1946, 1939, 1949,
+     1949, 1951, 1953, 1954, 1954, 1943, 1955, 1955, 1944, 1956,
+     1957, 1957, 1956, 1958, 1958, 1959, 1959, 1960, 1961, 1961,
+     1962, 1951, 1953, 1963, 1964, 1965, 1965, 1966, 1969, 1970,
+     1964, 1966, 1960, 1969, 1969, 1971, 1972, 1963, 1962, 1973,
+     1974, 1971, 1972, 1978, 1974, 1975, 1975, 1979, 1978, 1982,
 
-     1975, 1990, 1979, 1988, 1989, 1989, 1980, 1992, 1988, 1984,
-     1990, 1996, 1992, 1993, 1993, 1995, 1995, 1993, 1997, 1986,
-     1996, 1982, 1998, 1999, 2001, 2005, 2002, 2003, 1999, 2006,
-     2001, 2002, 2003, 2004, 2004, 2007, 2008, 2010, 1997, 2009,
-     2007, 1998, 2013, 2005, 2014, 2009, 2011, 2011, 2015, 2015,
-     2006, 2016, 2017, 2019, 2008, 2020, 2017, 2018, 2022, 2014,
-     2021, 2013, 2010, 2022, 2016, 2023, 2018, 2025, 2021, 2019,
-     2024, 2024, 2027, 2027, 2020, 2028, 2028, 2030, 2032, 2032,
-     2033, 2037, 2034, 2036, 2036, 2038, 2025, 2034, 2039, 2041,
-     2041, 2023, 2042, 2044, 2045, 2045, 2033, 2048, 2030, 2046,
+     1980, 1983, 1970, 1980, 1983, 1979, 1985, 1988, 1984, 1986,
+     1987, 1985, 1989, 1989, 1973, 1990, 1992, 1993, 1993, 1998,
+     1991, 1988, 1994, 1994, 1982, 1984, 1984, 1986, 1991, 1996,
+     1987, 1995, 1995, 1997, 1990, 1992, 1999, 2000, 1997, 1998,
+     2001, 2002, 2004, 2004, 2005, 1996, 2000, 2005, 2006, 2008,
+     2008, 2009, 2010, 2010, 2011, 2012, 2014, 2027, 2009, 2011,
+     2001, 2002, 1999, 2017, 2012, 2016, 2006, 2015, 2015, 2016,
+     2018, 2019, 2017, 2020, 2014, 2021, 2019, 2019, 2023, 2023,
+     2024, 2025, 2027, 2029, 2021, 2018, 2020, 2031, 2043, 2024,
+     2035, 2033, 2041, 2025, 2042, 2029, 2033, 2034, 2034, 2035,
 
-     2046, 2037, 2047, 2049, 2050, 2051, 2042, 2039, 2038, 2052,
-     2052, 2047, 2054, 2054, 2056, 2044, 2050, 2048, 2053, 2057,
-     2062, 2053, 2049, 2058, 2066, 2051, 2056, 2059, 2059, 2058,
-     2060, 2061, 2068, 2060, 2072, 2064, 2065, 2061, 2062, 2057,
-     2064, 2065, 2067, 2066, 2069, 2069, 2071, 2071, 2067, 2068,
-     2068, 2074, 2074, 2072, 2075, 2076, 2077, 2078, 2078, 2075,
-     2086, 2077, 2079, 2079, 2080, 2080, 2081, 2083, 2083, 2076,
-     2088, 2081, 2089, 2089, 2091, 2091, 2092, 2093, 2094, 2086,
-     2095, 2095, 2099, 2096, 2103, 2100, 2101, 2094, 2096, 2103,
-     2092, 2100, 2088, 2105, 2101, 2106, 2099, 2093, 2102, 2102,
+     2037, 2041, 2038, 2038, 2051, 2037, 2038, 2043, 2031, 2040,
+     2040, 2044, 2046, 2050, 2042, 2047, 2044, 2048, 2046, 2053,
+     2047, 2052, 2048, 2049, 2049, 2051, 2052, 2054, 2055, 2056,
+     2056, 2050, 2058, 2054, 2059, 2060, 2060, 2053, 2062, 2061,
+     2064, 2063, 2062, 2065, 2068, 2070, 2066, 2069, 2069, 2059,
+     2063, 2058, 2061, 2055, 2066, 2067, 2064, 2072, 2072, 2075,
+     2067, 2078, 2065, 2082, 2070, 2073, 2073, 2077, 2077, 2079,
+     2068, 2081, 2081, 2083, 2079, 2084, 2087, 2078, 2086, 2086,
+     2075, 2089, 2092, 2082, 2090, 2090, 2091, 2091, 2093, 2095,
+     2087, 2092, 2094, 2096, 2084, 2101, 2083, 2097, 2097, 2098,
 
-     2107, 2109, 2108, 2111, 2112, 2107, 2113, 2109, 2114, 2115,
-     2118, 2111, 2117, 2105, 2108, 2106, 2116, 2119, 2122, 2124,
-     2124,    0, 2119, 2112, 2125, 2125, 2113, 2115, 2114, 2117,
-     2117, 2118, 2116, 2126, 2130, 2130, 2137, 2126, 2122, 2132,
-     2132, 2133, 2133, 2134, 2133, 2136, 2136, 2134, 2138, 2140,
-     2140, 2141, 2142, 2143, 2137, 2145, 2142, 2146, 2141, 2147,
-     2147, 2150, 2138, 2148, 2148, 2152, 2146, 2151, 2143, 2149,
-     2149, 2155, 2151, 2145, 2152, 2153, 2150, 2152, 2154, 2156,
-     2153, 2153, 2157, 2158, 2154, 2159, 2160, 2189, 2158,    0,
-     2159, 2161, 2161, 2189, 2156, 2171, 2155, 2164, 2164, 2167,
+     2102, 2095, 2098, 2089, 2099, 2099, 2103, 2101, 2093, 2104,
+     2104, 2094, 2103, 2096, 2105, 2106, 2107, 2105, 2109, 2110,
+     2102, 2106, 2111, 2109, 2110, 2112, 2113, 2114, 2114, 2116,
+     2116, 2112, 2117, 2120, 2107, 2119, 2119, 2122, 2120, 2121,
+     2131, 2111, 2122, 2113, 2113, 2123, 2123, 2124, 2124, 2125,
+     2125, 2117, 2126, 2121, 2128, 2128, 2133, 2126, 2137, 2131,
+     2134, 2134, 2136, 2136, 2138, 2139, 2140, 2140, 2141, 2144,
+     2145, 2146, 2137, 2141, 2139, 2150, 2145, 2148, 2133, 2146,
+     2147, 2147, 2148, 2144, 2138, 2151, 2152, 2153, 2154, 2156,
+     2157, 2152, 2158, 2159, 2154, 2150, 2160, 2156, 2164, 2153,
 
-     2167, 2168, 2168, 2157, 2171, 2160, 2169, 2169, 2172, 2172,
-     2174, 2174, 2175, 2176, 2177, 2177, 2178, 2179, 2179, 2182,
-     2183, 2184, 2186, 2183, 2190, 2176, 2192, 2175, 2185, 2185,
-     2188, 2178, 2193, 2188, 2191, 2194, 2203, 2182, 2190, 2191,
-     2186, 2200, 2204, 2205, 2200, 2192, 2204, 2184, 2206, 2208,
-     2193, 2194, 2210, 2209, 2211, 2212, 2211, 2210, 2214, 2203,
-     2213, 2213, 2206, 2205, 2209, 2215, 2217, 2216, 2218, 2220,
-     2212, 2214, 2208, 2219, 2222, 2222, 2221, 2223, 2224, 2224,
-     2225, 2225, 2217, 2228, 2215, 2216, 2223, 2229, 2219, 2220,
-     2221, 2226, 2226, 2218, 2227, 2227, 2230, 2233, 2231, 2230,
+     2161, 2162, 2163, 2164, 2167, 2151, 2169, 2169, 2183, 2157,
+     2170, 2170, 2158, 2159, 2160,    0, 2161, 2171, 2162, 2162,
+     2182, 2171, 2183, 2163, 2167, 2175, 2175, 2177, 2177, 2178,
+     2178, 2179, 2178, 2181, 2181, 2179, 2185, 2185, 2182, 2186,
+     2187, 2188, 2190, 2191, 2187, 2200, 2186, 2192, 2192, 2193,
+     2193, 2195, 2191, 2194, 2194, 2197, 2188, 2196, 2201, 2199,
+     2190, 2202, 2196, 2198, 2197, 2199, 2195, 2197, 2198, 2198,
+     2200, 2203, 2204, 2201, 2205,    0, 2203, 2204, 2206, 2206,
+     2209, 2209, 2202, 2212, 2212, 2213, 2213, 2214, 2214, 2216,
+     2217, 2217, 2220, 2205, 2219, 2219, 2221, 2223, 2216, 2222,
 
-     2232, 2234, 2228, 2231, 2235, 2232, 2236, 2229, 2237, 2237,
-     2235, 2238, 2240, 2242, 2245, 2245, 2234, 2246, 2246, 2248,
-     2236, 2247, 2233, 2251, 2253, 2255, 2249, 2240, 2250, 2247,
-     2238, 2242, 2249, 2252, 2250, 2256, 2257, 2251, 2248, 2259,
-     2257, 2261, 2260, 2253, 2262, 2255, 2252, 2260, 2263, 2256,
-     2264, 2265, 2267, 2266, 2268,    0, 2265, 2262, 2266, 2259,
-     2261, 2263, 2269, 2269, 2272, 2272, 2270, 2273, 2271, 2264,
-     2267, 2270, 2273, 2268, 2271, 2274, 2275, 2276, 2277, 2281,
-     2274, 2275, 2278, 2281, 2277, 2279, 2279, 2278, 2282, 2284,
-     2283, 2285, 2286, 2287, 2289, 2289, 2276, 2283, 2286, 2293,
+     2222, 2224, 2224, 2227, 2229, 2231, 2228, 2220, 2221, 2228,
+     2230, 2230, 2223, 2233, 2234, 2235, 2233, 2236, 2237, 2239,
+     2234, 2227, 2236, 2231, 2238, 2245, 2248, 2249, 2245, 2235,
+     2229, 2249, 2250, 2251, 2253, 2239, 2255, 2237, 2256, 2254,
+     2256, 2255, 2238, 2257, 2258, 2258, 2259, 2251, 2260, 2248,
+     2254, 2261, 2250, 2263, 2262, 2265, 2264, 2253, 2257, 2259,
+     2266, 2267, 2267, 2268, 2269, 2269, 2273, 2260, 2274, 2261,
+     2262, 2264, 2268, 2278, 2266, 2265, 2270, 2270, 2263, 2271,
+     2271, 2272, 2272, 2275, 2276, 2273, 2275, 2277, 2274, 2276,
+     2279, 2280, 2277, 2281, 2282, 2282, 2283, 2280, 2278, 2285,
 
-     2288, 2291, 2291, 2294, 2293, 2292, 2295, 2282, 2284, 2301,
-     2285, 2296, 2287, 2288, 2292, 2297, 2297, 2292, 2298, 2299,
-     2302, 2302, 2294, 2298, 2296, 2295, 2303, 2304, 2304, 2305,
-     2305, 2306, 2299, 2307, 2308, 2301, 2306, 2309, 2309, 2310,
-     2307, 2311, 2313, 2311, 2310, 2303, 2312, 2312, 2314, 2313,
-     2315, 2316, 2317, 2308, 2320, 2314, 2316, 2319, 2319, 2322,
-     2323, 2324, 2325, 2329, 2322, 2323, 2326, 2326, 2330, 2315,
-        0, 2317,    0, 2320, 2328, 2328, 2331, 2331, 2332, 2332,
-     2324, 2325, 2329, 2333, 2335, 2335, 2337, 2330, 2336, 2336,
-     2333, 2339, 2342, 2337, 2343, 2344, 2339, 2342, 2345, 2345,
+     2287, 2290, 2290, 2291, 2291, 2279, 2293, 2281, 2292, 2296,
+     2298, 2294, 2300, 2295, 2285, 2283, 2292, 2294, 2287, 2295,
+     2297, 2301, 2302, 2296, 2304, 2293, 2302, 2306, 2307, 2298,
+     2308, 2305, 2300, 2297, 2309, 2301, 2305, 2310, 2312, 2313,
+     2311, 2307, 2310, 2308, 2304, 2311, 2306, 2314, 2314, 2315,
+     2318, 2316, 2321, 2309, 2315, 2318, 2312, 2316, 2313, 2317,
+     2317, 2319, 2320, 2322, 2326, 2323, 2319, 2320, 2326, 2322,
+     2323, 2321, 2324, 2324, 2327, 2328, 2329, 2330, 2331, 2332,
+     2337, 2333, 2328,    0, 2331, 2334, 2334, 2336, 2336, 2337,
+     2339, 2340, 2337, 2327, 2333, 2329, 2330, 2338, 2332, 2341,
 
-     2346, 2346,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0, 2343, 2344, 2350, 2350, 2350, 2350, 2350,
-     2350, 2350, 2351, 2351, 2351, 2351, 2351, 2351, 2351, 2352,
-     2352, 2352, 2352, 2352, 2352, 2352, 2353, 2353, 2353, 2353,
-     2353, 2353, 2353, 2354, 2354, 2354, 2354, 2354, 2354, 2354,
-     2356, 2356,    0, 2356, 2356, 2356, 2356, 2357, 2357,    0,
-        0,    0, 2357, 2357, 2358, 2358,    0,    0, 2358,    0,
-     2358, 2359,    0,    0,    0,    0,    0, 2359, 2360, 2360,
-        0,    0,    0, 2360, 2360, 2361,    0,    0,    0,    0,
-        0, 2361, 2362, 2362,    0, 2362, 2362, 2362, 2362, 2363,
+     2342, 2342, 2338, 2343, 2344, 2346, 2347, 2347, 2343, 2339,
+     2340, 2348, 2341, 2349, 2349, 2350, 2350, 2344, 2351, 2352,
+     2353, 2354, 2354, 2351, 2355, 2356, 2352, 2356, 2358, 2355,
+     2348, 2346, 2357, 2357, 2359, 2358, 2360, 2361, 2362, 2353,
+     2365, 2359, 2361, 2364, 2364, 2367, 2368, 2369, 2370, 2374,
+     2367, 2368, 2371, 2371, 2375, 2360,    0, 2362,    0, 2365,
+     2373, 2373, 2376, 2376, 2377, 2377, 2369, 2370, 2374, 2378,
+     2380, 2380, 2382, 2375, 2381, 2381, 2378, 2384, 2387, 2382,
+     2388, 2389, 2384, 2387, 2390, 2390, 2391, 2391,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0, 2388,
 
-     2363,    0, 2363, 2363, 2363, 2363, 2349, 2349, 2349, 2349,
-     2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349,
-     2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349,
-     2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349, 2349,
-     2349, 2349, 2349, 2349, 2349, 2349, 2349
+     2389, 2395, 2395, 2395, 2395, 2395, 2395, 2395, 2396, 2396,
+     2396, 2396, 2396, 2396, 2396, 2397, 2397, 2397, 2397, 2397,
+     2397, 2397, 2398, 2398, 2398, 2398, 2398, 2398, 2398, 2399,
+     2399, 2399, 2399, 2399, 2399, 2399, 2401, 2401,    0, 2401,
+     2401, 2401, 2401, 2402, 2402,    0,    0,    0, 2402, 2402,
+     2403, 2403,    0,    0, 2403,    0, 2403, 2404,    0,    0,
+        0,    0,    0, 2404, 2405, 2405,    0,    0,    0, 2405,
+     2405, 2406,    0,    0,    0,    0,    0, 2406, 2407, 2407,
+        0, 2407, 2407, 2407, 2407, 2408, 2408,    0, 2408, 2408,
+     2408, 2408, 2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394,
+
+     2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394,
+     2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394,
+     2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394, 2394,
+     2394, 2394, 2394
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -2440,7 +2476,7 @@ static void config_end_include(void)
 #define YY_NO_INPUT 1
 #endif
 
-#line 2442 "<stdout>"
+#line 2478 "<stdout>"
 
 #define INITIAL 0
 #define quotedstring 1
@@ -2663,7 +2699,7 @@ YY_DECL
 	{
 #line 207 "./util/configlexer.lex"
 
-#line 2665 "<stdout>"
+#line 2701 "<stdout>"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -2696,13 +2732,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 2350 )
+				if ( yy_current_state >= 2395 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 4607 );
+		while ( yy_base[yy_current_state] != 4693 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -3167,697 +3203,727 @@ YY_RULE_SETUP
 case 88:
 YY_RULE_SETUP
 #line 298 "./util/configlexer.lex"
-{ YDVAR(0, VAR_VIEW) }
+{ YDVAR(0, VAR_AUTH_ZONE) }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
 #line 299 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VIEW_FIRST) }
+{ YDVAR(1, VAR_ZONEFILE) }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
 #line 300 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
+{ YDVAR(1, VAR_MASTER) }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
 #line 301 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
+{ YDVAR(1, VAR_URL) }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
 #line 302 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL) }
+{ YDVAR(1, VAR_FOR_DOWNSTREAM) }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
 #line 303 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) }
+{ YDVAR(1, VAR_FOR_UPSTREAM) }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
 #line 304 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) }
+{ YDVAR(0, VAR_VIEW) }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
 #line 305 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) }
+{ YDVAR(1, VAR_VIEW_FIRST) }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
 #line 306 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) }
+{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
 #line 307 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) }
+{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
 #line 308 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) }
+{ YDVAR(2, VAR_ACCESS_CONTROL) }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
 #line 309 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_IDENTITY) }
+{ YDVAR(1, VAR_SEND_CLIENT_SUBNET) }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
 #line 310 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_VERSION) }
+{ YDVAR(1, VAR_CLIENT_SUBNET_ZONE) }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
 #line 311 "./util/configlexer.lex"
-{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) }
+{ YDVAR(1, VAR_CLIENT_SUBNET_ALWAYS_FORWARD) }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
 #line 312 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IDENTITY) }
+{ YDVAR(1, VAR_CLIENT_SUBNET_OPCODE) }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
 #line 313 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VERSION) }
+{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV4) }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
 #line 314 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MODULE_CONF) }
+{ YDVAR(1, VAR_MAX_CLIENT_SUBNET_IPV6) }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
 #line 315 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DLV_ANCHOR) }
+{ YDVAR(1, VAR_HIDE_IDENTITY) }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
 #line 316 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DLV_ANCHOR_FILE) }
+{ YDVAR(1, VAR_HIDE_VERSION) }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
 #line 317 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) }
+{ YDVAR(1, VAR_HIDE_TRUSTANCHOR) }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
 #line 318 "./util/configlexer.lex"
-{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) }
+{ YDVAR(1, VAR_IDENTITY) }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
 #line 319 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
+{ YDVAR(1, VAR_VERSION) }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
 #line 320 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR) }
+{ YDVAR(1, VAR_MODULE_CONF) }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
 #line 321 "./util/configlexer.lex"
-{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) }
+{ YDVAR(1, VAR_DLV_ANCHOR) }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
 #line 322 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
+{ YDVAR(1, VAR_DLV_ANCHOR_FILE) }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
 #line 323 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
+{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
 #line 324 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
+{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
 #line 325 "./util/configlexer.lex"
-{ YDVAR(1, VAR_BOGUS_TTL) }
+{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
 #line 326 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
+{ YDVAR(1, VAR_TRUST_ANCHOR) }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
 #line 327 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
+{ YDVAR(1, VAR_TRUST_ANCHOR_SIGNALING) }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
 #line 328 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IGNORE_CD_FLAG) }
+{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
 #line 329 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVE_EXPIRED) }
+{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
 #line 330 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAKE_DSA) }
+{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
 #line 331 "./util/configlexer.lex"
-{ YDVAR(1, VAR_FAKE_SHA1) }
+{ YDVAR(1, VAR_BOGUS_TTL) }
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
 #line 332 "./util/configlexer.lex"
-{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
+{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
 #line 333 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
+{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
 #line 334 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
+{ YDVAR(1, VAR_IGNORE_CD_FLAG) }
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
 #line 335 "./util/configlexer.lex"
-{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
+{ YDVAR(1, VAR_SERVE_EXPIRED) }
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
 #line 336 "./util/configlexer.lex"
-{ 
-				  YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
+{ YDVAR(1, VAR_FAKE_DSA) }
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 338 "./util/configlexer.lex"
-{ YDVAR(1, VAR_ADD_HOLDDOWN) }
+#line 337 "./util/configlexer.lex"
+{ YDVAR(1, VAR_FAKE_SHA1) }
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 339 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DEL_HOLDDOWN) }
+#line 338 "./util/configlexer.lex"
+{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 340 "./util/configlexer.lex"
-{ YDVAR(1, VAR_KEEP_MISSING) }
+#line 339 "./util/configlexer.lex"
+{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 341 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) }
+#line 340 "./util/configlexer.lex"
+{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 342 "./util/configlexer.lex"
-{ YDVAR(1, VAR_USE_SYSLOG) }
+#line 341 "./util/configlexer.lex"
+{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 343 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_IDENTITY) }
+#line 342 "./util/configlexer.lex"
+{ 
+				  YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
 #line 344 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_TIME_ASCII) }
+{ YDVAR(1, VAR_ADD_HOLDDOWN) }
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
 #line 345 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_QUERIES) }
+{ YDVAR(1, VAR_DEL_HOLDDOWN) }
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
 #line 346 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOG_REPLIES) }
+{ YDVAR(1, VAR_KEEP_MISSING) }
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
 #line 347 "./util/configlexer.lex"
-{ YDVAR(2, VAR_LOCAL_ZONE) }
+{ YDVAR(1, VAR_PERMIT_SMALL_HOLDDOWN) }
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
 #line 348 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA) }
+{ YDVAR(1, VAR_USE_SYSLOG) }
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
 #line 349 "./util/configlexer.lex"
-{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
+{ YDVAR(1, VAR_LOG_IDENTITY) }
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
 #line 350 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) }
+{ YDVAR(1, VAR_LOG_TIME_ASCII) }
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
 #line 351 "./util/configlexer.lex"
-{ YDVAR(1, VAR_INSECURE_LAN_ZONES) }
+{ YDVAR(1, VAR_LOG_QUERIES) }
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
 #line 352 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
+{ YDVAR(1, VAR_LOG_REPLIES) }
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
 #line 353 "./util/configlexer.lex"
-{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
+{ YDVAR(2, VAR_LOCAL_ZONE) }
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
 #line 354 "./util/configlexer.lex"
-{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
+{ YDVAR(1, VAR_LOCAL_DATA) }
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
 #line 355 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SHM_ENABLE) }
+{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
 #line 356 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SHM_KEY) }
+{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) }
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
 #line 357 "./util/configlexer.lex"
-{ YDVAR(0, VAR_REMOTE_CONTROL) }
+{ YDVAR(1, VAR_INSECURE_LAN_ZONES) }
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
 #line 358 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_ENABLE) }
+{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
 #line 359 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_INTERFACE) }
+{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
 #line 360 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_PORT) }
+{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
 #line 361 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_USE_CERT) }
+{ YDVAR(1, VAR_SHM_ENABLE) }
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
 #line 362 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_KEY_FILE) }
+{ YDVAR(1, VAR_SHM_KEY) }
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
 #line 363 "./util/configlexer.lex"
-{ YDVAR(1, VAR_SERVER_CERT_FILE) }
+{ YDVAR(0, VAR_REMOTE_CONTROL) }
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
 #line 364 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
+{ YDVAR(1, VAR_CONTROL_ENABLE) }
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
 #line 365 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
+{ YDVAR(1, VAR_CONTROL_INTERFACE) }
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
 #line 366 "./util/configlexer.lex"
-{ YDVAR(1, VAR_PYTHON_SCRIPT) }
+{ YDVAR(1, VAR_CONTROL_PORT) }
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
 #line 367 "./util/configlexer.lex"
-{ YDVAR(0, VAR_PYTHON) }
+{ YDVAR(1, VAR_CONTROL_USE_CERT) }
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
 #line 368 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DOMAIN_INSECURE) }
+{ YDVAR(1, VAR_SERVER_KEY_FILE) }
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
 #line 369 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MINIMAL_RESPONSES) }
+{ YDVAR(1, VAR_SERVER_CERT_FILE) }
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
 #line 370 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RRSET_ROUNDROBIN) }
+{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
 #line 371 "./util/configlexer.lex"
-{ YDVAR(1, VAR_MAX_UDP_SIZE) }
+{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
 #line 372 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_PREFIX) }
+{ YDVAR(1, VAR_PYTHON_SCRIPT) }
 	YY_BREAK
 case 162:
 YY_RULE_SETUP
 #line 373 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNS64_SYNTHALL) }
+{ YDVAR(0, VAR_PYTHON) }
 	YY_BREAK
 case 163:
 YY_RULE_SETUP
 #line 374 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DEFINE_TAG) }
+{ YDVAR(1, VAR_DOMAIN_INSECURE) }
 	YY_BREAK
 case 164:
 YY_RULE_SETUP
 #line 375 "./util/configlexer.lex"
-{ YDVAR(2, VAR_LOCAL_ZONE_TAG) }
+{ YDVAR(1, VAR_MINIMAL_RESPONSES) }
 	YY_BREAK
 case 165:
 YY_RULE_SETUP
 #line 376 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) }
+{ YDVAR(1, VAR_RRSET_ROUNDROBIN) }
 	YY_BREAK
 case 166:
 YY_RULE_SETUP
 #line 377 "./util/configlexer.lex"
-{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) }
+{ YDVAR(1, VAR_MAX_UDP_SIZE) }
 	YY_BREAK
 case 167:
 YY_RULE_SETUP
 #line 378 "./util/configlexer.lex"
-{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) }
+{ YDVAR(1, VAR_DNS64_PREFIX) }
 	YY_BREAK
 case 168:
 YY_RULE_SETUP
 #line 379 "./util/configlexer.lex"
-{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) }
+{ YDVAR(1, VAR_DNS64_SYNTHALL) }
 	YY_BREAK
 case 169:
 YY_RULE_SETUP
 #line 380 "./util/configlexer.lex"
-{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) }
+{ YDVAR(1, VAR_DEFINE_TAG) }
 	YY_BREAK
 case 170:
 YY_RULE_SETUP
 #line 381 "./util/configlexer.lex"
-{ YDVAR(0, VAR_DNSTAP) }
+{ YDVAR(2, VAR_LOCAL_ZONE_TAG) }
 	YY_BREAK
 case 171:
 YY_RULE_SETUP
 #line 382 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_ENABLE) }
+{ YDVAR(2, VAR_ACCESS_CONTROL_TAG) }
 	YY_BREAK
 case 172:
 YY_RULE_SETUP
 #line 383 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) }
+{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_ACTION) }
 	YY_BREAK
 case 173:
 YY_RULE_SETUP
 #line 384 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) }
+{ YDVAR(3, VAR_ACCESS_CONTROL_TAG_DATA) }
 	YY_BREAK
 case 174:
 YY_RULE_SETUP
 #line 385 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) }
+{ YDVAR(2, VAR_ACCESS_CONTROL_VIEW) }
 	YY_BREAK
 case 175:
 YY_RULE_SETUP
 #line 386 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_IDENTITY) }
+{ YDVAR(3, VAR_LOCAL_ZONE_OVERRIDE) }
 	YY_BREAK
 case 176:
 YY_RULE_SETUP
 #line 387 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSTAP_VERSION) }
+{ YDVAR(0, VAR_DNSTAP) }
 	YY_BREAK
 case 177:
 YY_RULE_SETUP
 #line 388 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) }
+{ YDVAR(1, VAR_DNSTAP_ENABLE) }
 	YY_BREAK
 case 178:
 YY_RULE_SETUP
-#line 390 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) }
+#line 389 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSTAP_SOCKET_PATH) }
 	YY_BREAK
 case 179:
 YY_RULE_SETUP
-#line 392 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) }
+#line 390 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) }
 	YY_BREAK
 case 180:
 YY_RULE_SETUP
-#line 394 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) }
+#line 391 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSTAP_SEND_VERSION) }
 	YY_BREAK
 case 181:
 YY_RULE_SETUP
-#line 396 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) }
+#line 392 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSTAP_IDENTITY) }
 	YY_BREAK
 case 182:
 YY_RULE_SETUP
-#line 398 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) }
+#line 393 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSTAP_VERSION) }
 	YY_BREAK
 case 183:
 YY_RULE_SETUP
-#line 400 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) }
+#line 394 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) }
 	YY_BREAK
 case 184:
 YY_RULE_SETUP
-#line 401 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT) }
+#line 396 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES) }
 	YY_BREAK
 case 185:
 YY_RULE_SETUP
-#line 402 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT) }
+#line 398 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES) }
 	YY_BREAK
 case 186:
 YY_RULE_SETUP
-#line 403 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) }
+#line 400 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_LOG_CLIENT_RESPONSE_MESSAGES) }
 	YY_BREAK
 case 187:
 YY_RULE_SETUP
-#line 404 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_SLABS) }
+#line 402 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_QUERY_MESSAGES) }
 	YY_BREAK
 case 188:
 YY_RULE_SETUP
-#line 405 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) }
+#line 404 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSTAP_LOG_FORWARDER_RESPONSE_MESSAGES) }
 	YY_BREAK
 case 189:
 YY_RULE_SETUP
 #line 406 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_SIZE) }
+{ YDVAR(1, VAR_DISABLE_DNSSEC_LAME_CHECK) }
 	YY_BREAK
 case 190:
 YY_RULE_SETUP
 #line 407 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
+{ YDVAR(1, VAR_IP_RATELIMIT) }
 	YY_BREAK
 case 191:
 YY_RULE_SETUP
 #line 408 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
+{ YDVAR(1, VAR_RATELIMIT) }
 	YY_BREAK
 case 192:
 YY_RULE_SETUP
 #line 409 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) }
+{ YDVAR(1, VAR_IP_RATELIMIT_SLABS) }
 	YY_BREAK
 case 193:
 YY_RULE_SETUP
 #line 410 "./util/configlexer.lex"
-{ YDVAR(1, VAR_RATELIMIT_FACTOR) }
+{ YDVAR(1, VAR_RATELIMIT_SLABS) }
 	YY_BREAK
 case 194:
 YY_RULE_SETUP
 #line 411 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP_TAG) }
+{ YDVAR(1, VAR_IP_RATELIMIT_SIZE) }
 	YY_BREAK
 case 195:
 YY_RULE_SETUP
 #line 412 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP) }
+{ YDVAR(1, VAR_RATELIMIT_SIZE) }
 	YY_BREAK
 case 196:
 YY_RULE_SETUP
 #line 413 "./util/configlexer.lex"
-{ YDVAR(2, VAR_RESPONSE_IP_DATA) }
+{ YDVAR(2, VAR_RATELIMIT_FOR_DOMAIN) }
 	YY_BREAK
 case 197:
 YY_RULE_SETUP
 #line 414 "./util/configlexer.lex"
-{ YDVAR(0, VAR_DNSCRYPT) }
+{ YDVAR(2, VAR_RATELIMIT_BELOW_DOMAIN) }
 	YY_BREAK
 case 198:
 YY_RULE_SETUP
 #line 415 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_ENABLE) }
+{ YDVAR(1, VAR_IP_RATELIMIT_FACTOR) }
 	YY_BREAK
 case 199:
 YY_RULE_SETUP
 #line 416 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PORT) }
+{ YDVAR(1, VAR_RATELIMIT_FACTOR) }
 	YY_BREAK
 case 200:
 YY_RULE_SETUP
 #line 417 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) }
+{ YDVAR(2, VAR_RESPONSE_IP_TAG) }
 	YY_BREAK
 case 201:
 YY_RULE_SETUP
 #line 418 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) }
+{ YDVAR(2, VAR_RESPONSE_IP) }
 	YY_BREAK
 case 202:
 YY_RULE_SETUP
 #line 419 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) }
+{ YDVAR(2, VAR_RESPONSE_IP_DATA) }
 	YY_BREAK
 case 203:
 YY_RULE_SETUP
 #line 420 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) }
+{ YDVAR(0, VAR_DNSCRYPT) }
 	YY_BREAK
 case 204:
 YY_RULE_SETUP
 #line 421 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) }
+{ YDVAR(1, VAR_DNSCRYPT_ENABLE) }
 	YY_BREAK
 case 205:
 YY_RULE_SETUP
-#line 423 "./util/configlexer.lex"
-{
-		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) }
+#line 422 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSCRYPT_PORT) }
 	YY_BREAK
 case 206:
 YY_RULE_SETUP
-#line 425 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) }
+#line 423 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER) }
 	YY_BREAK
 case 207:
 YY_RULE_SETUP
-#line 426 "./util/configlexer.lex"
-{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) }
+#line 424 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSCRYPT_SECRET_KEY) }
 	YY_BREAK
 case 208:
 YY_RULE_SETUP
-#line 427 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_ENABLED) }
+#line 425 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT) }
 	YY_BREAK
 case 209:
 YY_RULE_SETUP
-#line 428 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) }
+#line 426 "./util/configlexer.lex"
+{ YDVAR(1, VAR_DNSCRYPT_PROVIDER_CERT_ROTATED) }
 	YY_BREAK
 case 210:
 YY_RULE_SETUP
-#line 429 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_HOOK) }
+#line 427 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE) }
 	YY_BREAK
 case 211:
 YY_RULE_SETUP
-#line 430 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) }
+#line 429 "./util/configlexer.lex"
+{
+		YDVAR(1, VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS) }
 	YY_BREAK
 case 212:
 YY_RULE_SETUP
 #line 431 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_WHITELIST) }
+{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SIZE) }
 	YY_BREAK
 case 213:
 YY_RULE_SETUP
 #line 432 "./util/configlexer.lex"
-{ YDVAR(1, VAR_IPSECMOD_STRICT) }
+{ YDVAR(1, VAR_DNSCRYPT_NONCE_CACHE_SLABS) }
 	YY_BREAK
 case 214:
 YY_RULE_SETUP
 #line 433 "./util/configlexer.lex"
-{ YDVAR(0, VAR_CACHEDB) }
+{ YDVAR(1, VAR_IPSECMOD_ENABLED) }
 	YY_BREAK
 case 215:
 YY_RULE_SETUP
 #line 434 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_BACKEND) }
+{ YDVAR(1, VAR_IPSECMOD_IGNORE_BOGUS) }
 	YY_BREAK
 case 216:
 YY_RULE_SETUP
 #line 435 "./util/configlexer.lex"
-{ YDVAR(1, VAR_CACHEDB_SECRETSEED) }
+{ YDVAR(1, VAR_IPSECMOD_HOOK) }
 	YY_BREAK
 case 217:
 YY_RULE_SETUP
 #line 436 "./util/configlexer.lex"
-{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) }
+{ YDVAR(1, VAR_IPSECMOD_MAX_TTL) }
 	YY_BREAK
 case 218:
-/* rule 218 can match eol */
 YY_RULE_SETUP
 #line 437 "./util/configlexer.lex"
+{ YDVAR(1, VAR_IPSECMOD_WHITELIST) }
+	YY_BREAK
+case 219:
+YY_RULE_SETUP
+#line 438 "./util/configlexer.lex"
+{ YDVAR(1, VAR_IPSECMOD_STRICT) }
+	YY_BREAK
+case 220:
+YY_RULE_SETUP
+#line 439 "./util/configlexer.lex"
+{ YDVAR(0, VAR_CACHEDB) }
+	YY_BREAK
+case 221:
+YY_RULE_SETUP
+#line 440 "./util/configlexer.lex"
+{ YDVAR(1, VAR_CACHEDB_BACKEND) }
+	YY_BREAK
+case 222:
+YY_RULE_SETUP
+#line 441 "./util/configlexer.lex"
+{ YDVAR(1, VAR_CACHEDB_SECRETSEED) }
+	YY_BREAK
+case 223:
+YY_RULE_SETUP
+#line 442 "./util/configlexer.lex"
+{ YDVAR(1, VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM) }
+	YY_BREAK
+case 224:
+/* rule 224 can match eol */
+YY_RULE_SETUP
+#line 443 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++; }
 	YY_BREAK
 /* Quoted strings. Strip leading and ending quotes */
-case 219:
+case 225:
 YY_RULE_SETUP
-#line 440 "./util/configlexer.lex"
+#line 446 "./util/configlexer.lex"
 { BEGIN(quotedstring); LEXOUT(("QS ")); }
 	YY_BREAK
 case YY_STATE_EOF(quotedstring):
-#line 441 "./util/configlexer.lex"
+#line 447 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 220:
+case 226:
 YY_RULE_SETUP
-#line 446 "./util/configlexer.lex"
+#line 452 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
 	YY_BREAK
-case 221:
-/* rule 221 can match eol */
+case 227:
+/* rule 227 can match eol */
 YY_RULE_SETUP
-#line 447 "./util/configlexer.lex"
+#line 453 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end \""); 
 			  cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 222:
+case 228:
 YY_RULE_SETUP
-#line 449 "./util/configlexer.lex"
+#line 455 "./util/configlexer.lex"
 {
         LEXOUT(("QE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -3870,34 +3936,34 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* Single Quoted strings. Strip leading and ending quotes */
-case 223:
+case 229:
 YY_RULE_SETUP
-#line 461 "./util/configlexer.lex"
+#line 467 "./util/configlexer.lex"
 { BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
 	YY_BREAK
 case YY_STATE_EOF(singlequotedstr):
-#line 462 "./util/configlexer.lex"
+#line 468 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
 	YY_BREAK
-case 224:
+case 230:
 YY_RULE_SETUP
-#line 467 "./util/configlexer.lex"
+#line 473 "./util/configlexer.lex"
 { LEXOUT(("STR(%s) ", yytext)); yymore(); }
 	YY_BREAK
-case 225:
-/* rule 225 can match eol */
+case 231:
+/* rule 231 can match eol */
 YY_RULE_SETUP
-#line 468 "./util/configlexer.lex"
+#line 474 "./util/configlexer.lex"
 { yyerror("newline inside quoted string, no end '"); 
 			     cfg_parser->line++; BEGIN(INITIAL); }
 	YY_BREAK
-case 226:
+case 232:
 YY_RULE_SETUP
-#line 470 "./util/configlexer.lex"
+#line 476 "./util/configlexer.lex"
 {
         LEXOUT(("SQE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
@@ -3910,38 +3976,38 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 /* include: directive */
-case 227:
+case 233:
 YY_RULE_SETUP
-#line 482 "./util/configlexer.lex"
+#line 488 "./util/configlexer.lex"
 { 
 	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
 	YY_BREAK
 case YY_STATE_EOF(include):
-#line 484 "./util/configlexer.lex"
+#line 490 "./util/configlexer.lex"
 {
         yyerror("EOF inside include directive");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 228:
+case 234:
 YY_RULE_SETUP
-#line 488 "./util/configlexer.lex"
+#line 494 "./util/configlexer.lex"
 { LEXOUT(("ISP ")); /* ignore */ }
 	YY_BREAK
-case 229:
-/* rule 229 can match eol */
+case 235:
+/* rule 235 can match eol */
 YY_RULE_SETUP
-#line 489 "./util/configlexer.lex"
+#line 495 "./util/configlexer.lex"
 { LEXOUT(("NL\n")); cfg_parser->line++;}
 	YY_BREAK
-case 230:
+case 236:
 YY_RULE_SETUP
-#line 490 "./util/configlexer.lex"
+#line 496 "./util/configlexer.lex"
 { LEXOUT(("IQS ")); BEGIN(include_quoted); }
 	YY_BREAK
-case 231:
+case 237:
 YY_RULE_SETUP
-#line 491 "./util/configlexer.lex"
+#line 497 "./util/configlexer.lex"
 {
 	LEXOUT(("Iunquotedstr(%s) ", yytext));
 	config_start_include_glob(yytext);
@@ -3949,27 +4015,27 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case YY_STATE_EOF(include_quoted):
-#line 496 "./util/configlexer.lex"
+#line 502 "./util/configlexer.lex"
 {
         yyerror("EOF inside quoted string");
         BEGIN(inc_prev);
 }
 	YY_BREAK
-case 232:
+case 238:
 YY_RULE_SETUP
-#line 500 "./util/configlexer.lex"
+#line 506 "./util/configlexer.lex"
 { LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
 	YY_BREAK
-case 233:
-/* rule 233 can match eol */
+case 239:
+/* rule 239 can match eol */
 YY_RULE_SETUP
-#line 501 "./util/configlexer.lex"
+#line 507 "./util/configlexer.lex"
 { yyerror("newline before \" in include name"); 
 				  cfg_parser->line++; BEGIN(inc_prev); }
 	YY_BREAK
-case 234:
+case 240:
 YY_RULE_SETUP
-#line 503 "./util/configlexer.lex"
+#line 509 "./util/configlexer.lex"
 {
 	LEXOUT(("IQE "));
 	yytext[yyleng - 1] = '\0';
@@ -3979,7 +4045,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(val):
-#line 509 "./util/configlexer.lex"
+#line 515 "./util/configlexer.lex"
 {
 	LEXOUT(("LEXEOF "));
 	yy_set_bol(1); /* Set beginning of line, so "^" rules match.  */
@@ -3991,33 +4057,33 @@ case YY_STATE_EOF(val):
 	}
 }
 	YY_BREAK
-case 235:
+case 241:
 YY_RULE_SETUP
-#line 520 "./util/configlexer.lex"
+#line 526 "./util/configlexer.lex"
 { LEXOUT(("unquotedstr(%s) ", yytext)); 
 			if(--num_args == 0) { BEGIN(INITIAL); }
 			yylval.str = strdup(yytext); return STRING_ARG; }
 	YY_BREAK
-case 236:
+case 242:
 YY_RULE_SETUP
-#line 524 "./util/configlexer.lex"
+#line 530 "./util/configlexer.lex"
 {
 	ub_c_error_msg("unknown keyword '%s'", yytext);
 	}
 	YY_BREAK
-case 237:
+case 243:
 YY_RULE_SETUP
-#line 528 "./util/configlexer.lex"
+#line 534 "./util/configlexer.lex"
 {
 	ub_c_error_msg("stray '%s'", yytext);
 	}
 	YY_BREAK
-case 238:
+case 244:
 YY_RULE_SETUP
-#line 532 "./util/configlexer.lex"
+#line 538 "./util/configlexer.lex"
 ECHO;
 	YY_BREAK
-#line 4019 "<stdout>"
+#line 4085 "<stdout>"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -4308,7 +4374,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 2350 )
+			if ( yy_current_state >= 2395 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
@@ -4336,11 +4402,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 2350 )
+		if ( yy_current_state >= 2395 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
-	yy_is_jam = (yy_current_state == 2349);
+	yy_is_jam = (yy_current_state == 2394);
 
 		return yy_is_jam ? 0 : yy_current_state;
 }
@@ -4979,7 +5045,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 532 "./util/configlexer.lex"
+#line 538 "./util/configlexer.lex"
 
 
 
diff --git a/util/configlexer.lex b/util/configlexer.lex
index 51758ca51..c30c44b5d 100644
--- a/util/configlexer.lex
+++ b/util/configlexer.lex
@@ -295,6 +295,12 @@ forward-addr{COLON}		{ YDVAR(1, VAR_FORWARD_ADDR) }
 forward-host{COLON}		{ YDVAR(1, VAR_FORWARD_HOST) }
 forward-first{COLON}		{ YDVAR(1, VAR_FORWARD_FIRST) }
 forward-ssl-upstream{COLON}	{ YDVAR(1, VAR_FORWARD_SSL_UPSTREAM) }
+auth-zone{COLON}		{ YDVAR(0, VAR_AUTH_ZONE) }
+zonefile{COLON}			{ YDVAR(1, VAR_ZONEFILE) }
+master{COLON}			{ YDVAR(1, VAR_MASTER) }
+url{COLON}			{ YDVAR(1, VAR_URL) }
+for-downstream{COLON}		{ YDVAR(1, VAR_FOR_DOWNSTREAM) }
+for-upstream{COLON}		{ YDVAR(1, VAR_FOR_UPSTREAM) }
 view{COLON}			{ YDVAR(0, VAR_VIEW) }
 view-first{COLON}		{ YDVAR(1, VAR_VIEW_FIRST) }
 do-not-query-address{COLON}	{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
diff --git a/util/configparser.c b/util/configparser.c
index e10165ea3..b39e93447 100644
--- a/util/configparser.c
+++ b/util/configparser.c
@@ -347,7 +347,13 @@ extern int yydebug;
     VAR_CACHEDB = 476,
     VAR_CACHEDB_BACKEND = 477,
     VAR_CACHEDB_SECRETSEED = 478,
-    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 479
+    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 479,
+    VAR_FOR_UPSTREAM = 480,
+    VAR_AUTH_ZONE = 481,
+    VAR_ZONEFILE = 482,
+    VAR_MASTER = 483,
+    VAR_URL = 484,
+    VAR_FOR_DOWNSTREAM = 485
   };
 #endif
 /* Tokens.  */
@@ -573,6 +579,12 @@ extern int yydebug;
 #define VAR_CACHEDB_BACKEND 477
 #define VAR_CACHEDB_SECRETSEED 478
 #define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 479
+#define VAR_FOR_UPSTREAM 480
+#define VAR_AUTH_ZONE 481
+#define VAR_ZONEFILE 482
+#define VAR_MASTER 483
+#define VAR_URL 484
+#define VAR_FOR_DOWNSTREAM 485
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@ -583,7 +595,7 @@ union YYSTYPE
 
 	char*	str;
 
-#line 587 "util/configparser.c" /* yacc.c:355  */
+#line 599 "util/configparser.c" /* yacc.c:355  */
 };
 
 typedef union YYSTYPE YYSTYPE;
@@ -600,7 +612,7 @@ int yyparse (void);
 
 /* Copy the second part of user declarations.  */
 
-#line 604 "util/configparser.c" /* yacc.c:358  */
+#line 616 "util/configparser.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -842,21 +854,21 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   454
+#define YYLAST   467
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  225
+#define YYNTOKENS  231
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  242
+#define YYNNTS  251
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  463
+#define YYNRULES  479
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  695
+#define YYNSTATES  717
 
 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
    by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   479
+#define YYMAXUTOK   485
 
 #define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -912,60 +924,62 @@ static const yytype_uint8 yytranslate[] =
      185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
      195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
      205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,   222,   223,   224
+     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
+     225,   226,   227,   228,   229,   230
 };
 
 #if YYDEBUG
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   158,   158,   158,   159,   159,   160,   160,   161,   161,
-     161,   163,   164,   168,   173,   174,   175,   175,   175,   176,
-     176,   177,   177,   178,   178,   179,   179,   180,   180,   180,
-     181,   181,   181,   182,   182,   183,   183,   184,   184,   185,
-     185,   186,   186,   187,   187,   188,   188,   189,   189,   190,
-     190,   190,   191,   191,   191,   192,   192,   192,   193,   193,
-     194,   194,   195,   195,   196,   196,   197,   197,   197,   198,
-     198,   199,   199,   200,   200,   200,   201,   201,   202,   202,
-     203,   203,   204,   204,   204,   205,   205,   206,   206,   207,
-     207,   208,   208,   209,   209,   210,   210,   210,   211,   211,
-     212,   212,   212,   213,   213,   213,   214,   214,   214,   215,
-     215,   215,   215,   216,   216,   216,   217,   217,   217,   218,
-     218,   219,   219,   220,   220,   221,   221,   222,   222,   222,
-     223,   223,   224,   224,   225,   226,   226,   227,   227,   228,
-     228,   229,   230,   230,   231,   231,   232,   232,   233,   233,
-     233,   234,   234,   235,   235,   236,   236,   237,   237,   238,
-     238,   238,   239,   239,   239,   240,   240,   240,   241,   241,
-     242,   242,   243,   243,   244,   244,   245,   247,   259,   260,
-     261,   261,   261,   261,   261,   262,   264,   276,   277,   278,
-     278,   278,   278,   279,   281,   295,   296,   297,   297,   297,
-     297,   298,   298,   298,   300,   309,   318,   329,   338,   347,
-     356,   367,   376,   387,   400,   415,   426,   443,   460,   473,
-     488,   497,   506,   515,   524,   533,   542,   551,   560,   569,
-     578,   587,   596,   605,   614,   623,   632,   639,   646,   655,
-     664,   673,   687,   696,   705,   714,   721,   728,   754,   762,
-     769,   776,   783,   790,   798,   806,   814,   821,   832,   839,
-     848,   857,   866,   873,   880,   888,   896,   906,   916,   926,
-     939,   950,   958,   971,   980,   989,   998,  1008,  1018,  1026,
-    1039,  1048,  1056,  1065,  1073,  1086,  1095,  1102,  1112,  1122,
-    1132,  1142,  1152,  1162,  1172,  1182,  1189,  1196,  1203,  1212,
-    1221,  1230,  1237,  1247,  1264,  1271,  1289,  1302,  1315,  1324,
-    1333,  1342,  1351,  1361,  1371,  1380,  1389,  1402,  1415,  1424,
-    1431,  1440,  1449,  1458,  1467,  1475,  1488,  1496,  1524,  1531,
-    1546,  1556,  1566,  1573,  1580,  1589,  1603,  1622,  1641,  1653,
-    1665,  1677,  1688,  1707,  1717,  1726,  1734,  1742,  1755,  1768,
-    1781,  1794,  1803,  1812,  1822,  1832,  1845,  1858,  1869,  1882,
-    1893,  1906,  1916,  1923,  1930,  1939,  1949,  1959,  1969,  1976,
-    1983,  1992,  2002,  2012,  2041,  2051,  2059,  2068,  2083,  2092,
-    2097,  2098,  2099,  2099,  2099,  2100,  2100,  2100,  2101,  2101,
-    2103,  2113,  2122,  2129,  2139,  2146,  2153,  2160,  2167,  2172,
-    2173,  2174,  2174,  2175,  2175,  2176,  2176,  2177,  2178,  2179,
-    2180,  2181,  2182,  2184,  2192,  2199,  2207,  2215,  2222,  2229,
-    2238,  2247,  2256,  2265,  2274,  2283,  2288,  2289,  2290,  2292,
-    2298,  2308,  2315,  2324,  2332,  2338,  2339,  2341,  2341,  2341,
-    2342,  2342,  2343,  2344,  2345,  2346,  2347,  2349,  2359,  2369,
-    2376,  2385,  2392,  2401,  2409,  2422,  2430,  2443,  2448,  2449,
-    2450,  2450,  2452,  2466
+       0,   159,   159,   159,   160,   160,   161,   161,   162,   162,
+     162,   163,   163,   164,   168,   173,   174,   175,   175,   175,
+     176,   176,   177,   177,   178,   178,   179,   179,   180,   180,
+     180,   181,   181,   181,   182,   182,   183,   183,   184,   184,
+     185,   185,   186,   186,   187,   187,   188,   188,   189,   189,
+     190,   190,   190,   191,   191,   191,   192,   192,   192,   193,
+     193,   194,   194,   195,   195,   196,   196,   197,   197,   197,
+     198,   198,   199,   199,   200,   200,   200,   201,   201,   202,
+     202,   203,   203,   204,   204,   204,   205,   205,   206,   206,
+     207,   207,   208,   208,   209,   209,   210,   210,   210,   211,
+     211,   212,   212,   212,   213,   213,   213,   214,   214,   214,
+     215,   215,   215,   215,   216,   216,   216,   217,   217,   217,
+     218,   218,   219,   219,   220,   220,   221,   221,   222,   222,
+     222,   223,   223,   224,   224,   225,   226,   226,   227,   227,
+     228,   228,   229,   230,   230,   231,   231,   232,   232,   233,
+     233,   233,   234,   234,   235,   235,   236,   236,   237,   237,
+     238,   238,   238,   239,   239,   239,   240,   240,   240,   241,
+     241,   242,   242,   243,   243,   244,   244,   245,   247,   259,
+     260,   261,   261,   261,   261,   261,   262,   264,   276,   277,
+     278,   278,   278,   278,   279,   281,   295,   296,   297,   297,
+     297,   297,   298,   298,   298,   300,   315,   316,   317,   317,
+     317,   317,   318,   318,   320,   329,   338,   349,   358,   367,
+     376,   387,   396,   407,   420,   435,   446,   463,   480,   493,
+     508,   517,   526,   535,   544,   553,   562,   571,   580,   589,
+     598,   607,   616,   625,   634,   643,   652,   659,   666,   675,
+     684,   693,   707,   716,   725,   734,   741,   748,   774,   782,
+     789,   796,   803,   810,   818,   826,   834,   841,   852,   859,
+     868,   877,   886,   893,   900,   908,   916,   926,   936,   946,
+     959,   970,   978,   991,  1000,  1009,  1018,  1028,  1038,  1046,
+    1059,  1068,  1076,  1085,  1093,  1106,  1115,  1122,  1132,  1142,
+    1152,  1162,  1172,  1182,  1192,  1202,  1209,  1216,  1223,  1232,
+    1241,  1250,  1257,  1267,  1284,  1291,  1309,  1322,  1335,  1344,
+    1353,  1362,  1371,  1381,  1391,  1400,  1409,  1422,  1435,  1444,
+    1451,  1460,  1469,  1478,  1487,  1495,  1508,  1516,  1544,  1551,
+    1566,  1576,  1586,  1593,  1600,  1609,  1623,  1642,  1661,  1673,
+    1685,  1697,  1708,  1727,  1737,  1746,  1754,  1762,  1775,  1788,
+    1801,  1814,  1823,  1832,  1842,  1852,  1865,  1878,  1889,  1902,
+    1913,  1926,  1936,  1943,  1950,  1959,  1969,  1979,  1989,  1996,
+    2003,  2012,  2022,  2032,  2039,  2046,  2053,  2063,  2073,  2083,
+    2112,  2122,  2130,  2139,  2154,  2163,  2168,  2169,  2170,  2170,
+    2170,  2171,  2171,  2171,  2172,  2172,  2174,  2184,  2193,  2200,
+    2210,  2217,  2224,  2231,  2238,  2243,  2244,  2245,  2245,  2246,
+    2246,  2247,  2247,  2248,  2249,  2250,  2251,  2252,  2253,  2255,
+    2263,  2270,  2278,  2286,  2293,  2300,  2309,  2318,  2327,  2336,
+    2345,  2354,  2359,  2360,  2361,  2363,  2369,  2379,  2386,  2395,
+    2403,  2409,  2410,  2412,  2412,  2412,  2413,  2413,  2414,  2415,
+    2416,  2417,  2418,  2420,  2430,  2440,  2447,  2456,  2463,  2472,
+    2480,  2493,  2501,  2514,  2519,  2520,  2521,  2521,  2523,  2537
 };
 #endif
 
@@ -1055,14 +1069,17 @@ static const char *const yytname[] =
   "VAR_IPSECMOD_ENABLED", "VAR_IPSECMOD_HOOK", "VAR_IPSECMOD_IGNORE_BOGUS",
   "VAR_IPSECMOD_MAX_TTL", "VAR_IPSECMOD_WHITELIST", "VAR_IPSECMOD_STRICT",
   "VAR_CACHEDB", "VAR_CACHEDB_BACKEND", "VAR_CACHEDB_SECRETSEED",
-  "VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM", "$accept", "toplevelvars",
-  "toplevelvar", "serverstart", "contents_server", "content_server",
-  "stubstart", "contents_stub", "content_stub", "forwardstart",
-  "contents_forward", "content_forward", "viewstart", "contents_view",
-  "content_view", "server_num_threads", "server_verbosity",
-  "server_statistics_interval", "server_statistics_cumulative",
-  "server_extended_statistics", "server_shm_enable", "server_shm_key",
-  "server_port", "server_send_client_subnet", "server_client_subnet_zone",
+  "VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM", "VAR_FOR_UPSTREAM",
+  "VAR_AUTH_ZONE", "VAR_ZONEFILE", "VAR_MASTER", "VAR_URL",
+  "VAR_FOR_DOWNSTREAM", "$accept", "toplevelvars", "toplevelvar",
+  "serverstart", "contents_server", "content_server", "stubstart",
+  "contents_stub", "content_stub", "forwardstart", "contents_forward",
+  "content_forward", "viewstart", "contents_view", "content_view",
+  "authstart", "contents_auth", "content_auth", "server_num_threads",
+  "server_verbosity", "server_statistics_interval",
+  "server_statistics_cumulative", "server_extended_statistics",
+  "server_shm_enable", "server_shm_key", "server_port",
+  "server_send_client_subnet", "server_client_subnet_zone",
   "server_client_subnet_always_forward", "server_client_subnet_opcode",
   "server_max_client_subnet_ipv4", "server_max_client_subnet_ipv6",
   "server_interface", "server_outgoing_interface", "server_outgoing_range",
@@ -1128,15 +1145,16 @@ static const char *const yytname[] =
   "server_ipsecmod_strict", "stub_name", "stub_host", "stub_addr",
   "stub_first", "stub_ssl_upstream", "stub_prime", "forward_name",
   "forward_host", "forward_addr", "forward_first", "forward_ssl_upstream",
-  "view_name", "view_local_zone", "view_response_ip",
-  "view_response_ip_data", "view_local_data", "view_local_data_ptr",
-  "view_first", "rcstart", "contents_rc", "content_rc",
-  "rc_control_enable", "rc_control_port", "rc_control_interface",
-  "rc_control_use_cert", "rc_server_key_file", "rc_server_cert_file",
-  "rc_control_key_file", "rc_control_cert_file", "dtstart", "contents_dt",
-  "content_dt", "dt_dnstap_enable", "dt_dnstap_socket_path",
-  "dt_dnstap_send_identity", "dt_dnstap_send_version",
-  "dt_dnstap_identity", "dt_dnstap_version",
+  "auth_name", "auth_zonefile", "auth_master", "auth_url",
+  "auth_for_downstream", "auth_for_upstream", "view_name",
+  "view_local_zone", "view_response_ip", "view_response_ip_data",
+  "view_local_data", "view_local_data_ptr", "view_first", "rcstart",
+  "contents_rc", "content_rc", "rc_control_enable", "rc_control_port",
+  "rc_control_interface", "rc_control_use_cert", "rc_server_key_file",
+  "rc_server_cert_file", "rc_control_key_file", "rc_control_cert_file",
+  "dtstart", "contents_dt", "content_dt", "dt_dnstap_enable",
+  "dt_dnstap_socket_path", "dt_dnstap_send_identity",
+  "dt_dnstap_send_version", "dt_dnstap_identity", "dt_dnstap_version",
   "dt_dnstap_log_resolver_query_messages",
   "dt_dnstap_log_resolver_response_messages",
   "dt_dnstap_log_client_query_messages",
@@ -1184,14 +1202,15 @@ static const yytype_uint16 yytoknum[] =
      445,   446,   447,   448,   449,   450,   451,   452,   453,   454,
      455,   456,   457,   458,   459,   460,   461,   462,   463,   464,
      465,   466,   467,   468,   469,   470,   471,   472,   473,   474,
-     475,   476,   477,   478,   479
+     475,   476,   477,   478,   479,   480,   481,   482,   483,   484,
+     485
 };
 # endif
 
-#define YYPACT_NINF -216
+#define YYPACT_NINF -215
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-216)))
+  (!!((Yystate) == (-215)))
 
 #define YYTABLE_NINF -1
 
@@ -1202,76 +1221,78 @@ static const yytype_uint16 yytoknum[] =
      STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
-    -216,     0,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,   210,   -38,   -34,   -39,   -64,  -130,  -105,  -157,
-    -215,    -1,     2,     3,    26,    29,    30,    32,    33,    34,
-      35,    36,    48,    49,    50,    51,    53,    54,    56,    57,
-      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    82,    83,    84,    86,    89,    91,    92,
-      93,    94,    95,    96,    98,    99,   100,   101,   102,   103,
-     104,   105,   106,   107,   108,   109,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
-     126,   127,   128,   129,   130,   131,   132,   133,   134,   136,
-     137,   138,   139,   140,   141,   142,   143,   144,   146,   147,
-     148,   149,   150,   151,   152,   153,   154,   155,   156,   157,
-     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
-     168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   183,   184,   185,   186,   187,   188,
-     189,   190,   191,   192,   193,   195,   196,   197,   198,   199,
-     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
-     240,   241,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,   242,   243,   247,   248,   249,   291,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,   292,   293,   294,
-     295,   296,  -216,  -216,  -216,  -216,  -216,  -216,   297,   298,
-     299,   303,   307,   308,   332,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,   333,   334,   335,   345,   346,   347,   348,
-     349,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-     350,   351,   352,   353,   354,   355,   356,   357,   392,   394,
-     404,   405,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,   406,  -216,  -216,   407,   408,
-     409,   410,   411,   412,   413,   414,   421,   422,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,   423,
-     425,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-     426,   427,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,   428,   429,   430,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,   431,   432,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,   433,   434,   435,   436,   437,   438,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,   439,  -216,  -216,
-     440,   441,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,   442,   443,   444,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216
+    -215,     0,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,   215,   -37,   -33,   -38,   -39,   -63,
+    -129,  -104,  -157,  -214,     2,     3,     4,    27,    30,    32,
+      33,    34,    35,    36,    48,    49,    50,    51,    52,    54,
+      55,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,    80,    82,    83,    84,    85,    87,
+      90,    92,    93,    94,    95,    96,    98,    99,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,   109,   110,   113,
+     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
+     124,   125,   126,   127,   128,   129,   130,   131,   132,   133,
+     134,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   147,   148,   149,   150,   151,   152,   153,   154,   155,
+     156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
+     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
+     177,   183,   184,   185,   186,   187,   188,   189,   190,   191,
+     192,   193,   195,   196,   197,   198,   199,   200,   201,   202,
+     203,   204,   205,   206,   207,   208,   209,   210,   212,   213,
+     214,   245,   246,   247,   248,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,   252,   253,   254,
+     296,   297,   298,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+     299,   300,   301,   302,   303,  -215,  -215,  -215,  -215,  -215,
+    -215,   304,   308,   312,   313,   337,   338,   339,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,   340,   350,   351,   352,
+     353,   354,  -215,  -215,  -215,  -215,  -215,  -215,  -215,   355,
+     356,   357,   358,   359,   360,   361,   362,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,   397,   399,   409,   410,
+     411,   412,   413,   414,   415,   416,   417,   418,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,   419,  -215,  -215,   426,   427,   428,   430,   431,   432,
+     433,   434,   435,   436,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,   437,   438,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,   439,   440,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+     441,   442,   443,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,   444,   445,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,   446,
+     447,   448,   449,   450,   451,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,   452,  -215,  -215,   453,   454,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,   455,   456,   457,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -1279,10 +1300,10 @@ static const yytype_int16 yypact[] =
      means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-       2,     0,     1,    13,   177,   186,   379,   425,   398,   194,
-     434,   457,     3,    15,   179,   188,   196,   381,   400,   427,
-     436,   459,     4,     5,     6,    10,     8,     9,     7,    11,
-      12,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       2,     0,     1,    14,   178,   187,   395,   441,   414,   195,
+     450,   473,   205,     3,    16,   180,   189,   197,   207,   397,
+     416,   443,   452,   475,     4,     5,     6,    10,    13,     8,
+       9,     7,    11,    12,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1298,94 +1319,97 @@ static const yytype_uint16 yydefact[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    14,    16,    17,    76,    79,    88,   165,   166,
-      18,   138,   139,   140,   141,   142,   143,    27,    67,    19,
-      80,    81,    38,    60,    75,    20,    21,    23,    24,    22,
-      25,    26,   111,   176,   112,   113,   114,   115,   161,    77,
-      66,    92,   109,   110,    28,    29,    30,    31,    32,    68,
-      82,    83,    98,    54,    64,    55,   169,    93,    48,    49,
-     168,    50,    51,   102,   106,   119,   127,   148,   103,    61,
-      33,    34,    35,    90,   120,   121,   122,    36,    37,    39,
-      40,    42,    43,    41,   125,    44,    45,    46,    52,    71,
-     107,    85,   126,    78,   144,    86,    87,   104,   105,    91,
-      47,    69,    72,    53,    56,    94,    95,    70,   145,    96,
-      57,    58,    59,   108,   158,   159,   167,    97,    65,    99,
-     100,   101,   146,    62,    63,    84,    73,    74,    89,   116,
-     117,   118,   123,   124,   149,   150,   152,   154,   155,   153,
-     156,   162,   128,   129,   132,   133,   130,   131,   134,   135,
-     137,   136,   147,   157,   170,   172,   171,   173,   174,   175,
-     151,   160,   163,   164,     0,     0,     0,     0,     0,     0,
-     178,   180,   181,   182,   184,   185,   183,     0,     0,     0,
-       0,     0,   187,   189,   190,   191,   192,   193,     0,     0,
-       0,     0,     0,     0,     0,   195,   197,   198,   201,   202,
-     199,   203,   200,     0,     0,     0,     0,     0,     0,     0,
-       0,   380,   382,   384,   383,   389,   385,   386,   387,   388,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   399,   401,   402,   403,   404,   405,   406,   407,
-     408,   409,   410,   411,   412,     0,   426,   428,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   435,   437,
-     438,   439,   441,   442,   440,   443,   444,   445,   446,     0,
-       0,   458,   460,   461,   205,   204,   211,   220,   218,   226,
-     227,   230,   228,   229,   231,   232,   245,   246,   247,   248,
-     249,   271,   272,   273,   278,   279,   223,   280,   281,   284,
-     282,   283,   286,   287,   288,   301,   259,   260,   262,   263,
-     289,   304,   254,   256,   305,   311,   312,   313,   224,   270,
-     324,   325,   255,   319,   241,   219,   250,   302,   308,   290,
-       0,     0,   328,   225,   206,   240,   294,   207,   221,   222,
-     251,   252,   326,   292,   296,   297,   208,   329,   274,   300,
-     242,   258,   306,   307,   310,   318,   253,   322,   320,   321,
-     264,   269,   298,   299,   265,   266,   291,   314,   243,   244,
-     233,   235,   236,   237,   238,   330,   331,   332,   275,   276,
-     277,   285,   333,   334,     0,     0,     0,   293,   267,   430,
-     343,   347,   345,   344,   348,   346,     0,     0,   351,   352,
-     212,   213,   214,   215,   216,   217,   295,   309,   323,   353,
-     354,   268,   335,     0,     0,     0,     0,     0,     0,   315,
-     316,   317,   431,   261,   257,   239,   209,   210,   355,   357,
-     356,   358,   359,   360,   234,   361,   362,   363,   366,   365,
-     364,   367,   368,   369,   370,   371,   372,     0,   376,   377,
-       0,     0,   378,   390,   392,   391,   394,   395,   396,   397,
-     393,   413,   414,   415,   416,   417,   418,   419,   420,   421,
-     422,   423,   424,   429,   447,   448,   449,   452,   450,   451,
-     453,   454,   455,   456,   462,   463,   303,   327,   342,   432,
-     433,   349,   350,   336,   337,     0,     0,     0,   341,   373,
-     374,   375,   340,   338,   339
+       0,     0,     0,     0,     0,    15,    17,    18,    77,    80,
+      89,   166,   167,    19,   139,   140,   141,   142,   143,   144,
+      28,    68,    20,    81,    82,    39,    61,    76,    21,    22,
+      24,    25,    23,    26,    27,   112,   177,   113,   114,   115,
+     116,   162,    78,    67,    93,   110,   111,    29,    30,    31,
+      32,    33,    69,    83,    84,    99,    55,    65,    56,   170,
+      94,    49,    50,   169,    51,    52,   103,   107,   120,   128,
+     149,   104,    62,    34,    35,    36,    91,   121,   122,   123,
+      37,    38,    40,    41,    43,    44,    42,   126,    45,    46,
+      47,    53,    72,   108,    86,   127,    79,   145,    87,    88,
+     105,   106,    92,    48,    70,    73,    54,    57,    95,    96,
+      71,   146,    97,    58,    59,    60,   109,   159,   160,   168,
+      98,    66,   100,   101,   102,   147,    63,    64,    85,    74,
+      75,    90,   117,   118,   119,   124,   125,   150,   151,   153,
+     155,   156,   154,   157,   163,   129,   130,   133,   134,   131,
+     132,   135,   136,   138,   137,   148,   158,   171,   173,   172,
+     174,   175,   176,   152,   161,   164,   165,     0,     0,     0,
+       0,     0,     0,   179,   181,   182,   183,   185,   186,   184,
+       0,     0,     0,     0,     0,   188,   190,   191,   192,   193,
+     194,     0,     0,     0,     0,     0,     0,     0,   196,   198,
+     199,   202,   203,   200,   204,   201,     0,     0,     0,     0,
+       0,     0,   206,   208,   209,   210,   211,   212,   213,     0,
+       0,     0,     0,     0,     0,     0,     0,   396,   398,   400,
+     399,   405,   401,   402,   403,   404,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   415,   417,
+     418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
+     428,     0,   442,   444,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   451,   453,   454,   455,   457,   458,
+     456,   459,   460,   461,   462,     0,     0,   474,   476,   477,
+     215,   214,   221,   230,   228,   236,   237,   240,   238,   239,
+     241,   242,   255,   256,   257,   258,   259,   281,   282,   283,
+     288,   289,   233,   290,   291,   294,   292,   293,   296,   297,
+     298,   311,   269,   270,   272,   273,   299,   314,   264,   266,
+     315,   321,   322,   323,   234,   280,   334,   335,   265,   329,
+     251,   229,   260,   312,   318,   300,     0,     0,   338,   235,
+     216,   250,   304,   217,   231,   232,   261,   262,   336,   302,
+     306,   307,   218,   339,   284,   310,   252,   268,   316,   317,
+     320,   328,   263,   332,   330,   331,   274,   279,   308,   309,
+     275,   276,   301,   324,   253,   254,   243,   245,   246,   247,
+     248,   340,   341,   342,   285,   286,   287,   295,   343,   344,
+       0,     0,     0,   303,   277,   446,   353,   357,   355,   354,
+     358,   356,     0,     0,   361,   362,   222,   223,   224,   225,
+     226,   227,   305,   319,   333,   363,   364,   278,   345,     0,
+       0,     0,     0,     0,     0,   325,   326,   327,   447,   271,
+     267,   249,   219,   220,   365,   367,   366,   368,   369,   370,
+     244,   371,   372,   373,   376,   375,   374,   377,   378,   379,
+     380,   381,   388,     0,   392,   393,     0,     0,   394,   382,
+     387,   383,   384,   385,   386,   406,   408,   407,   410,   411,
+     412,   413,   409,   429,   430,   431,   432,   433,   434,   435,
+     436,   437,   438,   439,   440,   445,   463,   464,   465,   468,
+     466,   467,   469,   470,   471,   472,   478,   479,   313,   337,
+     352,   448,   449,   359,   360,   346,   347,     0,     0,     0,
+     351,   389,   390,   391,   350,   348,   349
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,  -216,
-    -216,  -216
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,    12,    13,    22,   192,    14,    23,   360,    15,
-      24,   372,    16,    25,   385,   193,   194,   195,   196,   197,
+      -1,     1,    13,    14,    24,   195,    15,    25,   363,    16,
+      26,   375,    17,    27,   388,    18,    28,   402,   196,   197,
      198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
      208,   209,   210,   211,   212,   213,   214,   215,   216,   217,
      218,   219,   220,   221,   222,   223,   224,   225,   226,   227,
@@ -1401,14 +1425,15 @@ static const yytype_int16 yydefgoto[] =
      318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
      328,   329,   330,   331,   332,   333,   334,   335,   336,   337,
      338,   339,   340,   341,   342,   343,   344,   345,   346,   347,
-     348,   349,   361,   362,   363,   364,   365,   366,   373,   374,
-     375,   376,   377,   386,   387,   388,   389,   390,   391,   392,
-      17,    26,   401,   402,   403,   404,   405,   406,   407,   408,
-     409,    18,    27,   422,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,    19,    28,   436,   437,
-     350,   351,   352,   353,    20,    29,   448,   449,   450,   451,
-     452,   453,   454,   455,   456,   457,   458,    21,    30,   461,
-     462,   463
+     348,   349,   350,   351,   352,   364,   365,   366,   367,   368,
+     369,   376,   377,   378,   379,   380,   403,   404,   405,   406,
+     407,   408,   389,   390,   391,   392,   393,   394,   395,    19,
+      29,   417,   418,   419,   420,   421,   422,   423,   424,   425,
+      20,    30,   438,   439,   440,   441,   442,   443,   444,   445,
+     446,   447,   448,   449,   450,    21,    31,   452,   453,   353,
+     354,   355,   356,    22,    32,   464,   465,   466,   467,   468,
+     469,   470,   471,   472,   473,   474,    23,    33,   477,   478,
+     479
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -1416,155 +1441,158 @@ static const yytype_int16 yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_uint16 yytable[] =
 {
-       2,   378,   354,   435,   355,   356,   367,   459,   460,   464,
-       0,     3,   465,   466,   368,   369,   410,   411,   412,   413,
-     414,   415,   416,   417,   418,   419,   420,   421,   393,   394,
-     395,   396,   397,   398,   399,   400,   467,   379,   380,   468,
-     469,     4,   470,   471,   472,   473,   474,     5,   438,   439,
-     440,   441,   442,   443,   444,   445,   446,   447,   475,   476,
-     477,   478,   381,   479,   480,   357,   481,   482,   483,   484,
-     485,   486,   487,   488,   489,   490,   491,   492,   493,   494,
-     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
-     505,     6,   506,   507,   508,   358,   509,   359,   370,   510,
-     371,   511,   512,   513,   514,   515,   516,     7,   517,   518,
-     519,   520,   521,   522,   523,   524,   525,   526,   527,   528,
-     382,   383,   529,   530,   531,   532,   533,   534,   535,   536,
-     537,   538,   539,   540,   541,   542,   543,   544,   545,   546,
-     547,   548,   549,   550,   551,     8,   552,   553,   554,   555,
-     556,   557,   558,   559,   560,   384,   561,   562,   563,   564,
-     565,   566,   567,   568,   569,   570,   571,   572,   573,   574,
-     575,   576,   577,   578,   579,   580,   581,   582,   583,   584,
-     585,   586,   587,   588,   589,   590,   591,   592,   593,   594,
-     595,   596,     9,   597,   598,   599,   600,   601,   602,   603,
-     604,   605,   606,   607,    10,   608,   609,   610,   611,   612,
-     613,   614,   615,   616,   617,   618,   619,   620,   621,   622,
-       0,    11,    31,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
-     623,   624,   625,   626,    59,    60,    61,   627,   628,   629,
-      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
-      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
-     102,   630,   631,   632,   633,   634,   635,   636,   637,   638,
-     103,   104,   105,   639,   106,   107,   108,   640,   641,   109,
-     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
-     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
-     130,   131,   642,   643,   644,   645,   132,   133,   134,   135,
-     136,   137,   138,   139,   140,   646,   647,   648,   649,   650,
-     651,   652,   653,   654,   655,   656,   657,   658,   141,   142,
-     143,   144,   145,   146,   147,   148,   149,   150,   151,   152,
-     153,   154,   155,   156,   157,   158,   159,   160,   161,   162,
-     163,   164,   165,   166,   167,   168,   169,   170,   171,   172,
-     173,   174,   659,   175,   660,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,   661,   662,   663,   664,   665,   666,
-     667,   668,   669,   670,   671,   185,   186,   187,   188,   189,
-     190,   672,   673,   674,   191,   675,   676,   677,   678,   679,
-     680,   681,   682,   683,   684,   685,   686,   687,   688,   689,
-     690,   691,   692,   693,   694
+       2,   396,   381,   357,   451,   358,   359,   370,   475,   476,
+       0,     3,   480,   481,   482,   371,   372,   426,   427,   428,
+     429,   430,   431,   432,   433,   434,   435,   436,   437,   409,
+     410,   411,   412,   413,   414,   415,   416,   483,   382,   383,
+     484,     4,   485,   486,   487,   488,   489,     5,   454,   455,
+     456,   457,   458,   459,   460,   461,   462,   463,   490,   491,
+     492,   493,   494,   384,   495,   496,   360,   497,   498,   499,
+     500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
+     510,   511,   512,   513,   514,   515,   516,   517,   518,   519,
+     520,     6,   521,   522,   523,   524,   361,   525,   362,   373,
+     526,   374,   527,   528,   529,   530,   531,     7,   532,   533,
+     534,   535,   536,   537,   538,   539,   540,   541,   542,   543,
+     544,   385,   386,   545,   546,   547,   548,   549,   550,   551,
+     552,   553,   554,   555,   556,   557,   558,   559,   560,   561,
+     562,   563,   564,   565,   566,     8,   567,   568,   569,   570,
+     571,   572,   573,   574,   575,   576,   387,   577,   578,   579,
+     580,   581,   582,   583,   584,   585,   586,   587,   588,   589,
+     590,   591,   592,   593,   594,   595,   596,   597,   598,   599,
+     600,   601,   602,   603,   604,   605,   397,   606,   398,   399,
+     400,   401,     9,   607,   608,   609,   610,   611,   612,   613,
+     614,   615,   616,   617,    10,   618,   619,   620,   621,   622,
+     623,   624,   625,   626,   627,   628,   629,   630,   631,   632,
+     633,    11,   634,   635,   636,     0,    12,    34,    35,    36,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    61,   637,   638,   639,   640,    62,
+      63,    64,   641,   642,   643,    65,    66,    67,    68,    69,
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,   644,   645,   646,   647,
+     648,   649,   650,   651,   652,   106,   107,   108,   653,   109,
+     110,   111,   654,   655,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
+     128,   129,   130,   131,   132,   133,   134,   656,   657,   658,
+     659,   135,   136,   137,   138,   139,   140,   141,   142,   143,
+     660,   661,   662,   663,   664,   665,   666,   667,   668,   669,
+     670,   671,   672,   144,   145,   146,   147,   148,   149,   150,
+     151,   152,   153,   154,   155,   156,   157,   158,   159,   160,
+     161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
+     171,   172,   173,   174,   175,   176,   177,   673,   178,   674,
+     179,   180,   181,   182,   183,   184,   185,   186,   187,   675,
+     676,   677,   678,   679,   680,   681,   682,   683,   684,   685,
+     188,   189,   190,   191,   192,   193,   686,   687,   688,   194,
+     689,   690,   691,   692,   693,   694,   695,   696,   697,   698,
+     699,   700,   701,   702,   703,   704,   705,   706,   707,   708,
+     709,   710,   711,   712,   713,   714,   715,   716
 };
 
 static const yytype_int16 yycheck[] =
 {
-       0,    40,    40,   108,    42,    43,    40,   222,   223,    10,
-      -1,    11,    10,    10,    48,    49,   146,   147,   148,   149,
-     150,   151,   152,   153,   154,   155,   156,   157,    92,    93,
-      94,    95,    96,    97,    98,    99,    10,    76,    77,    10,
+       0,    40,    40,    40,   108,    42,    43,    40,   222,   223,
+      -1,    11,    10,    10,    10,    48,    49,   146,   147,   148,
+     149,   150,   151,   152,   153,   154,   155,   156,   157,    92,
+      93,    94,    95,    96,    97,    98,    99,    10,    76,    77,
       10,    41,    10,    10,    10,    10,    10,    47,   205,   206,
      207,   208,   209,   210,   211,   212,   213,   214,    10,    10,
-      10,    10,   101,    10,    10,   103,    10,    10,    10,    10,
+      10,    10,    10,   101,    10,    10,   103,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    91,    10,    10,    10,   133,    10,   135,   132,    10,
-     134,    10,    10,    10,    10,    10,    10,   107,    10,    10,
+      10,    91,    10,    10,    10,    10,   133,    10,   135,   132,
+      10,   134,    10,    10,    10,    10,    10,   107,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-     159,   160,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,   159,   160,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,   145,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,   194,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,   194,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,   192,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,   225,    10,   227,   228,
+     229,   230,   192,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,   204,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      -1,   221,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
-      10,    10,    10,    10,    44,    45,    46,    10,    10,    10,
-      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
-      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
-      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
-      90,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-     100,   101,   102,    10,   104,   105,   106,    10,    10,   109,
-     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
-     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
-     130,   131,    10,    10,    10,    10,   136,   137,   138,   139,
-     140,   141,   142,   143,   144,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,    10,    10,    10,   158,   159,
-     160,   161,   162,   163,   164,   165,   166,   167,   168,   169,
-     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
-     180,   181,   182,   183,   184,   185,   186,   187,   188,   189,
-     190,   191,    10,   193,    10,   195,   196,   197,   198,   199,
-     200,   201,   202,   203,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10,   215,   216,   217,   218,   219,
-     220,    10,    10,    10,   224,    10,    10,    10,    10,    10,
+      10,   221,    10,    10,    10,    -1,   226,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    10,    10,    10,    10,    44,
+      45,    46,    10,    10,    10,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,   100,   101,   102,    10,   104,
+     105,   106,    10,    10,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,    10,    10,    10,
+      10,   136,   137,   138,   139,   140,   141,   142,   143,   144,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10
+      10,    10,    10,   158,   159,   160,   161,   162,   163,   164,
+     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+     185,   186,   187,   188,   189,   190,   191,    10,   193,    10,
+     195,   196,   197,   198,   199,   200,   201,   202,   203,    10,
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+     215,   216,   217,   218,   219,   220,    10,    10,    10,   224,
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,    10,    10
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */
 static const yytype_uint16 yystos[] =
 {
-       0,   226,     0,    11,    41,    47,    91,   107,   145,   192,
-     204,   221,   227,   228,   231,   234,   237,   415,   426,   441,
-     449,   462,   229,   232,   235,   238,   416,   427,   442,   450,
-     463,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    32,    33,    34,    35,    36,    37,    38,    39,    44,
-      45,    46,    50,    51,    52,    53,    54,    55,    56,    57,
-      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,   100,   101,   102,   104,   105,   106,   109,
-     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
-     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
-     130,   131,   136,   137,   138,   139,   140,   141,   142,   143,
-     144,   158,   159,   160,   161,   162,   163,   164,   165,   166,
-     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
-     187,   188,   189,   190,   191,   193,   195,   196,   197,   198,
-     199,   200,   201,   202,   203,   215,   216,   217,   218,   219,
-     220,   224,   230,   240,   241,   242,   243,   244,   245,   246,
-     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
-     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
-     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
-     327,   328,   329,   330,   331,   332,   333,   334,   335,   336,
-     337,   338,   339,   340,   341,   342,   343,   344,   345,   346,
-     347,   348,   349,   350,   351,   352,   353,   354,   355,   356,
-     357,   358,   359,   360,   361,   362,   363,   364,   365,   366,
-     367,   368,   369,   370,   371,   372,   373,   374,   375,   376,
-     377,   378,   379,   380,   381,   382,   383,   384,   385,   386,
-     387,   388,   389,   390,   391,   392,   393,   394,   395,   396,
-     445,   446,   447,   448,    40,    42,    43,   103,   133,   135,
-     233,   397,   398,   399,   400,   401,   402,    40,    48,    49,
-     132,   134,   236,   403,   404,   405,   406,   407,    40,    76,
-      77,   101,   159,   160,   194,   239,   408,   409,   410,   411,
-     412,   413,   414,    92,    93,    94,    95,    96,    97,    98,
-      99,   417,   418,   419,   420,   421,   422,   423,   424,   425,
-     146,   147,   148,   149,   150,   151,   152,   153,   154,   155,
-     156,   157,   428,   429,   430,   431,   432,   433,   434,   435,
-     436,   437,   438,   439,   440,   108,   443,   444,   205,   206,
-     207,   208,   209,   210,   211,   212,   213,   214,   451,   452,
-     453,   454,   455,   456,   457,   458,   459,   460,   461,   222,
-     223,   464,   465,   466,    10,    10,    10,    10,    10,    10,
+       0,   232,     0,    11,    41,    47,    91,   107,   145,   192,
+     204,   221,   226,   233,   234,   237,   240,   243,   246,   430,
+     441,   456,   464,   477,   235,   238,   241,   244,   247,   431,
+     442,   457,   465,   478,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
+      38,    39,    44,    45,    46,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,   100,   101,   102,   104,
+     105,   106,   109,   110,   111,   112,   113,   114,   115,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   131,   136,   137,   138,   139,   140,
+     141,   142,   143,   144,   158,   159,   160,   161,   162,   163,
+     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
+     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,   185,   186,   187,   188,   189,   190,   191,   193,   195,
+     196,   197,   198,   199,   200,   201,   202,   203,   215,   216,
+     217,   218,   219,   220,   224,   236,   249,   250,   251,   252,
+     253,   254,   255,   256,   257,   258,   259,   260,   261,   262,
+     263,   264,   265,   266,   267,   268,   269,   270,   271,   272,
+     273,   274,   275,   276,   277,   278,   279,   280,   281,   282,
+     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
+     293,   294,   295,   296,   297,   298,   299,   300,   301,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+     313,   314,   315,   316,   317,   318,   319,   320,   321,   322,
+     323,   324,   325,   326,   327,   328,   329,   330,   331,   332,
+     333,   334,   335,   336,   337,   338,   339,   340,   341,   342,
+     343,   344,   345,   346,   347,   348,   349,   350,   351,   352,
+     353,   354,   355,   356,   357,   358,   359,   360,   361,   362,
+     363,   364,   365,   366,   367,   368,   369,   370,   371,   372,
+     373,   374,   375,   376,   377,   378,   379,   380,   381,   382,
+     383,   384,   385,   386,   387,   388,   389,   390,   391,   392,
+     393,   394,   395,   396,   397,   398,   399,   400,   401,   402,
+     403,   404,   405,   460,   461,   462,   463,    40,    42,    43,
+     103,   133,   135,   239,   406,   407,   408,   409,   410,   411,
+      40,    48,    49,   132,   134,   242,   412,   413,   414,   415,
+     416,    40,    76,    77,   101,   159,   160,   194,   245,   423,
+     424,   425,   426,   427,   428,   429,    40,   225,   227,   228,
+     229,   230,   248,   417,   418,   419,   420,   421,   422,    92,
+      93,    94,    95,    96,    97,    98,    99,   432,   433,   434,
+     435,   436,   437,   438,   439,   440,   146,   147,   148,   149,
+     150,   151,   152,   153,   154,   155,   156,   157,   443,   444,
+     445,   446,   447,   448,   449,   450,   451,   452,   453,   454,
+     455,   108,   458,   459,   205,   206,   207,   208,   209,   210,
+     211,   212,   213,   214,   466,   467,   468,   469,   470,   471,
+     472,   473,   474,   475,   476,   222,   223,   479,   480,   481,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
@@ -1587,66 +1615,68 @@ static const yytype_uint16 yystos[] =
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
       10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-      10,    10,    10,    10,    10
+      10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
+      10,    10,    10,    10,    10,    10,    10
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint16 yyr1[] =
 {
-       0,   225,   226,   226,   227,   227,   227,   227,   227,   227,
-     227,   227,   227,   228,   229,   229,   230,   230,   230,   230,
-     230,   230,   230,   230,   230,   230,   230,   230,   230,   230,
-     230,   230,   230,   230,   230,   230,   230,   230,   230,   230,
-     230,   230,   230,   230,   230,   230,   230,   230,   230,   230,
-     230,   230,   230,   230,   230,   230,   230,   230,   230,   230,
-     230,   230,   230,   230,   230,   230,   230,   230,   230,   230,
-     230,   230,   230,   230,   230,   230,   230,   230,   230,   230,
-     230,   230,   230,   230,   230,   230,   230,   230,   230,   230,
-     230,   230,   230,   230,   230,   230,   230,   230,   230,   230,
-     230,   230,   230,   230,   230,   230,   230,   230,   230,   230,
-     230,   230,   230,   230,   230,   230,   230,   230,   230,   230,
-     230,   230,   230,   230,   230,   230,   230,   230,   230,   230,
-     230,   230,   230,   230,   230,   230,   230,   230,   230,   230,
-     230,   230,   230,   230,   230,   230,   230,   230,   230,   230,
-     230,   230,   230,   230,   230,   230,   230,   230,   230,   230,
-     230,   230,   230,   230,   230,   230,   230,   230,   230,   230,
-     230,   230,   230,   230,   230,   230,   230,   231,   232,   232,
-     233,   233,   233,   233,   233,   233,   234,   235,   235,   236,
-     236,   236,   236,   236,   237,   238,   238,   239,   239,   239,
-     239,   239,   239,   239,   240,   241,   242,   243,   244,   245,
-     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
-     256,   257,   258,   259,   260,   261,   262,   263,   264,   265,
-     266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
-     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
-     286,   287,   288,   289,   290,   291,   292,   293,   294,   295,
-     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
-     306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
-     316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
-     326,   327,   328,   329,   330,   331,   332,   333,   334,   335,
-     336,   337,   338,   339,   340,   341,   342,   343,   344,   345,
-     346,   347,   348,   349,   350,   351,   352,   353,   354,   355,
-     356,   357,   358,   359,   360,   361,   362,   363,   364,   365,
-     366,   367,   368,   369,   370,   371,   372,   373,   374,   375,
-     376,   377,   378,   379,   380,   381,   382,   383,   384,   385,
-     386,   387,   388,   389,   390,   391,   392,   393,   394,   395,
-     396,   397,   398,   399,   400,   401,   402,   403,   404,   405,
-     406,   407,   408,   409,   410,   411,   412,   413,   414,   415,
-     416,   416,   417,   417,   417,   417,   417,   417,   417,   417,
-     418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
-     427,   428,   428,   428,   428,   428,   428,   428,   428,   428,
-     428,   428,   428,   429,   430,   431,   432,   433,   434,   435,
-     436,   437,   438,   439,   440,   441,   442,   442,   443,   444,
-     445,   446,   447,   448,   449,   450,   450,   451,   451,   451,
-     451,   451,   451,   451,   451,   451,   451,   452,   453,   454,
-     455,   456,   457,   458,   459,   460,   461,   462,   463,   463,
-     464,   464,   465,   466
+       0,   231,   232,   232,   233,   233,   233,   233,   233,   233,
+     233,   233,   233,   233,   234,   235,   235,   236,   236,   236,
+     236,   236,   236,   236,   236,   236,   236,   236,   236,   236,
+     236,   236,   236,   236,   236,   236,   236,   236,   236,   236,
+     236,   236,   236,   236,   236,   236,   236,   236,   236,   236,
+     236,   236,   236,   236,   236,   236,   236,   236,   236,   236,
+     236,   236,   236,   236,   236,   236,   236,   236,   236,   236,
+     236,   236,   236,   236,   236,   236,   236,   236,   236,   236,
+     236,   236,   236,   236,   236,   236,   236,   236,   236,   236,
+     236,   236,   236,   236,   236,   236,   236,   236,   236,   236,
+     236,   236,   236,   236,   236,   236,   236,   236,   236,   236,
+     236,   236,   236,   236,   236,   236,   236,   236,   236,   236,
+     236,   236,   236,   236,   236,   236,   236,   236,   236,   236,
+     236,   236,   236,   236,   236,   236,   236,   236,   236,   236,
+     236,   236,   236,   236,   236,   236,   236,   236,   236,   236,
+     236,   236,   236,   236,   236,   236,   236,   236,   236,   236,
+     236,   236,   236,   236,   236,   236,   236,   236,   236,   236,
+     236,   236,   236,   236,   236,   236,   236,   236,   237,   238,
+     238,   239,   239,   239,   239,   239,   239,   240,   241,   241,
+     242,   242,   242,   242,   242,   243,   244,   244,   245,   245,
+     245,   245,   245,   245,   245,   246,   247,   247,   248,   248,
+     248,   248,   248,   248,   249,   250,   251,   252,   253,   254,
+     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
+     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
+     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
+     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
+     415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
+     425,   426,   427,   428,   429,   430,   431,   431,   432,   432,
+     432,   432,   432,   432,   432,   432,   433,   434,   435,   436,
+     437,   438,   439,   440,   441,   442,   442,   443,   443,   443,
+     443,   443,   443,   443,   443,   443,   443,   443,   443,   444,
+     445,   446,   447,   448,   449,   450,   451,   452,   453,   454,
+     455,   456,   457,   457,   458,   459,   460,   461,   462,   463,
+     464,   465,   465,   466,   466,   466,   466,   466,   466,   466,
+     466,   466,   466,   467,   468,   469,   470,   471,   472,   473,
+     474,   475,   476,   477,   478,   478,   479,   479,   480,   481
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {
        0,     2,     0,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     1,     2,     0,     1,     1,     1,     1,
+       2,     2,     2,     2,     1,     2,     0,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
@@ -1662,9 +1692,10 @@ static const yytype_uint8 yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     2,     0,
-       1,     1,     1,     1,     1,     1,     1,     2,     0,     1,
-       1,     1,     1,     1,     1,     2,     0,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
+       0,     1,     1,     1,     1,     1,     1,     1,     2,     0,
+       1,     1,     1,     1,     1,     1,     2,     0,     1,     1,
+       1,     1,     1,     1,     1,     1,     2,     0,     1,     1,
        1,     1,     1,     1,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -1682,16 +1713,16 @@ static const yytype_uint8 yyr2[] =
        4,     3,     3,     2,     2,     2,     2,     2,     2,     3,
        3,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     3,     3,     3,     2,     2,     2,     1,
-       2,     0,     1,     1,     1,     1,     1,     1,     1,     1,
-       2,     2,     2,     2,     2,     2,     2,     2,     1,     2,
-       0,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     3,
+       3,     3,     2,     2,     2,     1,     2,     0,     1,     1,
+       1,     1,     1,     1,     1,     1,     2,     2,     2,     2,
+       2,     2,     2,     2,     1,     2,     0,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     1,     2,     0,     1,     2,     2,     2,     3,     3,
+       1,     2,     0,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     1,     2,     0,     1,     2,
-       2,     2,     3,     3,     1,     2,     0,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     1,     2,     0,
-       1,     1,     2,     2
+       2,     2,     2,     1,     2,     0,     1,     1,     2,     2
 };
 
 
@@ -2367,15 +2398,15 @@ yyreduce:
   YY_REDUCE_PRINT (yyn);
   switch (yyn)
     {
-        case 13:
+        case 14:
 #line 169 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("\nP(server:)\n")); 
 	}
-#line 2376 "util/configparser.c" /* yacc.c:1646  */
+#line 2407 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 177:
+  case 178:
 #line 248 "./util/configparser.y" /* yacc.c:1646  */
     {
 		struct config_stub* s;
@@ -2387,10 +2418,10 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2391 "util/configparser.c" /* yacc.c:1646  */
+#line 2422 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 186:
+  case 187:
 #line 265 "./util/configparser.y" /* yacc.c:1646  */
     {
 		struct config_stub* s;
@@ -2402,10 +2433,10 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2406 "util/configparser.c" /* yacc.c:1646  */
+#line 2437 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 194:
+  case 195:
 #line 282 "./util/configparser.y" /* yacc.c:1646  */
     {
 		struct config_view* s;
@@ -2419,11 +2450,29 @@ yyreduce:
 		} else 
 			yyerror("out of memory");
 	}
-#line 2423 "util/configparser.c" /* yacc.c:1646  */
+#line 2454 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 204:
+  case 205:
 #line 301 "./util/configparser.y" /* yacc.c:1646  */
+    {
+		struct config_auth* s;
+		OUTYY(("\nP(auth_zone:)\n")); 
+		s = (struct config_auth*)calloc(1, sizeof(struct config_auth));
+		if(s) {
+			s->next = cfg_parser->cfg->auths;
+			cfg_parser->cfg->auths = s;
+			/* defaults for auth zone */
+			s->for_downstream = 1;
+			s->for_upstream = 1;
+		} else 
+			yyerror("out of memory");
+	}
+#line 2472 "util/configparser.c" /* yacc.c:1646  */
+    break;
+
+  case 214:
+#line 321 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_num_threads:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -2431,11 +2480,11 @@ yyreduce:
 		else cfg_parser->cfg->num_threads = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2435 "util/configparser.c" /* yacc.c:1646  */
+#line 2484 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 205:
-#line 310 "./util/configparser.y" /* yacc.c:1646  */
+  case 215:
+#line 330 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_verbosity:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -2443,11 +2492,11 @@ yyreduce:
 		else cfg_parser->cfg->verbosity = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2447 "util/configparser.c" /* yacc.c:1646  */
+#line 2496 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 206:
-#line 319 "./util/configparser.y" /* yacc.c:1646  */
+  case 216:
+#line 339 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_statistics_interval:%s)\n", (yyvsp[0].str))); 
 		if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0)
@@ -2457,11 +2506,11 @@ yyreduce:
 		else cfg_parser->cfg->stat_interval = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2461 "util/configparser.c" /* yacc.c:1646  */
+#line 2510 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 207:
-#line 330 "./util/configparser.y" /* yacc.c:1646  */
+  case 217:
+#line 350 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_statistics_cumulative:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2469,11 +2518,11 @@ yyreduce:
 		else cfg_parser->cfg->stat_cumulative = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2473 "util/configparser.c" /* yacc.c:1646  */
+#line 2522 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 208:
-#line 339 "./util/configparser.y" /* yacc.c:1646  */
+  case 218:
+#line 359 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_extended_statistics:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2481,11 +2530,11 @@ yyreduce:
 		else cfg_parser->cfg->stat_extended = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2485 "util/configparser.c" /* yacc.c:1646  */
+#line 2534 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 209:
-#line 348 "./util/configparser.y" /* yacc.c:1646  */
+  case 219:
+#line 368 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_shm_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2493,11 +2542,11 @@ yyreduce:
 		else cfg_parser->cfg->shm_enable = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2497 "util/configparser.c" /* yacc.c:1646  */
+#line 2546 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 210:
-#line 357 "./util/configparser.y" /* yacc.c:1646  */
+  case 220:
+#line 377 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_shm_key:%s)\n", (yyvsp[0].str))); 
 		if(strcmp((yyvsp[0].str), "") == 0 || strcmp((yyvsp[0].str), "0") == 0)
@@ -2507,11 +2556,11 @@ yyreduce:
 		else cfg_parser->cfg->shm_key = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2511 "util/configparser.c" /* yacc.c:1646  */
+#line 2560 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 211:
-#line 368 "./util/configparser.y" /* yacc.c:1646  */
+  case 221:
+#line 388 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -2519,11 +2568,11 @@ yyreduce:
 		else cfg_parser->cfg->port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2523 "util/configparser.c" /* yacc.c:1646  */
+#line 2572 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 212:
-#line 377 "./util/configparser.y" /* yacc.c:1646  */
+  case 222:
+#line 397 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_send_client_subnet:%s)\n", (yyvsp[0].str)));
@@ -2533,11 +2582,11 @@ yyreduce:
 		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
 	#endif
 	}
-#line 2537 "util/configparser.c" /* yacc.c:1646  */
+#line 2586 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 213:
-#line 388 "./util/configparser.y" /* yacc.c:1646  */
+  case 223:
+#line 408 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_client_subnet_zone:%s)\n", (yyvsp[0].str)));
@@ -2548,11 +2597,11 @@ yyreduce:
 		OUTYY(("P(Compiled without edns subnet option, ignoring)\n"));
 	#endif
 	}
-#line 2552 "util/configparser.c" /* yacc.c:1646  */
+#line 2601 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 214:
-#line 401 "./util/configparser.y" /* yacc.c:1646  */
+  case 224:
+#line 421 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(server_client_subnet_always_forward:%s)\n", (yyvsp[0].str)));
@@ -2566,11 +2615,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 2570 "util/configparser.c" /* yacc.c:1646  */
+#line 2619 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 215:
-#line 416 "./util/configparser.y" /* yacc.c:1646  */
+  case 225:
+#line 436 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(client_subnet_opcode:%s)\n", (yyvsp[0].str)));
@@ -2580,11 +2629,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 2584 "util/configparser.c" /* yacc.c:1646  */
+#line 2633 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 216:
-#line 427 "./util/configparser.y" /* yacc.c:1646  */
+  case 226:
+#line 447 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_client_subnet_ipv4:%s)\n", (yyvsp[0].str)));
@@ -2600,11 +2649,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 2604 "util/configparser.c" /* yacc.c:1646  */
+#line 2653 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 217:
-#line 444 "./util/configparser.y" /* yacc.c:1646  */
+  case 227:
+#line 464 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef CLIENT_SUBNET
 		OUTYY(("P(max_client_subnet_ipv6:%s)\n", (yyvsp[0].str)));
@@ -2620,11 +2669,11 @@ yyreduce:
 	#endif
 		free((yyvsp[0].str));
 	}
-#line 2624 "util/configparser.c" /* yacc.c:1646  */
+#line 2673 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 218:
-#line 461 "./util/configparser.y" /* yacc.c:1646  */
+  case 228:
+#line 481 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_interface:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->num_ifs == 0)
@@ -2636,11 +2685,11 @@ yyreduce:
 		else
 			cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = (yyvsp[0].str);
 	}
-#line 2640 "util/configparser.c" /* yacc.c:1646  */
+#line 2689 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 219:
-#line 474 "./util/configparser.y" /* yacc.c:1646  */
+  case 229:
+#line 494 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_interface:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->num_out_ifs == 0)
@@ -2654,11 +2703,11 @@ yyreduce:
 			cfg_parser->cfg->out_ifs[
 				cfg_parser->cfg->num_out_ifs++] = (yyvsp[0].str);
 	}
-#line 2658 "util/configparser.c" /* yacc.c:1646  */
+#line 2707 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 220:
-#line 489 "./util/configparser.y" /* yacc.c:1646  */
+  case 230:
+#line 509 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_range:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -2666,11 +2715,11 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_num_ports = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2670 "util/configparser.c" /* yacc.c:1646  */
+#line 2719 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 221:
-#line 498 "./util/configparser.y" /* yacc.c:1646  */
+  case 231:
+#line 518 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_port_permit:%s)\n", (yyvsp[0].str)));
 		if(!cfg_mark_ports((yyvsp[0].str), 1, 
@@ -2678,11 +2727,11 @@ yyreduce:
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 2682 "util/configparser.c" /* yacc.c:1646  */
+#line 2731 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 222:
-#line 507 "./util/configparser.y" /* yacc.c:1646  */
+  case 232:
+#line 527 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_port_avoid:%s)\n", (yyvsp[0].str)));
 		if(!cfg_mark_ports((yyvsp[0].str), 0, 
@@ -2690,11 +2739,11 @@ yyreduce:
 			yyerror("port number or range (\"low-high\") expected");
 		free((yyvsp[0].str));
 	}
-#line 2694 "util/configparser.c" /* yacc.c:1646  */
+#line 2743 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 223:
-#line 516 "./util/configparser.y" /* yacc.c:1646  */
+  case 233:
+#line 536 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_num_tcp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -2702,11 +2751,11 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2706 "util/configparser.c" /* yacc.c:1646  */
+#line 2755 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 224:
-#line 525 "./util/configparser.y" /* yacc.c:1646  */
+  case 234:
+#line 545 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_incoming_num_tcp:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -2714,11 +2763,11 @@ yyreduce:
 		else cfg_parser->cfg->incoming_num_tcp = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2718 "util/configparser.c" /* yacc.c:1646  */
+#line 2767 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 225:
-#line 534 "./util/configparser.y" /* yacc.c:1646  */
+  case 235:
+#line 554 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_interface_automatic:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2726,11 +2775,11 @@ yyreduce:
 		else cfg_parser->cfg->if_automatic = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2730 "util/configparser.c" /* yacc.c:1646  */
+#line 2779 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 226:
-#line 543 "./util/configparser.y" /* yacc.c:1646  */
+  case 236:
+#line 563 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_ip4:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2738,11 +2787,11 @@ yyreduce:
 		else cfg_parser->cfg->do_ip4 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2742 "util/configparser.c" /* yacc.c:1646  */
+#line 2791 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 227:
-#line 552 "./util/configparser.y" /* yacc.c:1646  */
+  case 237:
+#line 572 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_ip6:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2750,11 +2799,11 @@ yyreduce:
 		else cfg_parser->cfg->do_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2754 "util/configparser.c" /* yacc.c:1646  */
+#line 2803 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 228:
-#line 561 "./util/configparser.y" /* yacc.c:1646  */
+  case 238:
+#line 581 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_udp:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2762,11 +2811,11 @@ yyreduce:
 		else cfg_parser->cfg->do_udp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2766 "util/configparser.c" /* yacc.c:1646  */
+#line 2815 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 229:
-#line 570 "./util/configparser.y" /* yacc.c:1646  */
+  case 239:
+#line 590 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_tcp:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2774,11 +2823,11 @@ yyreduce:
 		else cfg_parser->cfg->do_tcp = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2778 "util/configparser.c" /* yacc.c:1646  */
+#line 2827 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 230:
-#line 579 "./util/configparser.y" /* yacc.c:1646  */
+  case 240:
+#line 599 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_prefer_ip6:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2786,11 +2835,11 @@ yyreduce:
 		else cfg_parser->cfg->prefer_ip6 = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2790 "util/configparser.c" /* yacc.c:1646  */
+#line 2839 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 231:
-#line 588 "./util/configparser.y" /* yacc.c:1646  */
+  case 241:
+#line 608 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tcp_mss:%s)\n", (yyvsp[0].str)));
                 if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -2798,11 +2847,11 @@ yyreduce:
                 else cfg_parser->cfg->tcp_mss = atoi((yyvsp[0].str));
                 free((yyvsp[0].str));
 	}
-#line 2802 "util/configparser.c" /* yacc.c:1646  */
+#line 2851 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 232:
-#line 597 "./util/configparser.y" /* yacc.c:1646  */
+  case 242:
+#line 617 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_outgoing_tcp_mss:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -2810,11 +2859,11 @@ yyreduce:
 		else cfg_parser->cfg->outgoing_tcp_mss = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2814 "util/configparser.c" /* yacc.c:1646  */
+#line 2863 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 233:
-#line 606 "./util/configparser.y" /* yacc.c:1646  */
+  case 243:
+#line 626 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_tcp_upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2822,11 +2871,11 @@ yyreduce:
 		else cfg_parser->cfg->tcp_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2826 "util/configparser.c" /* yacc.c:1646  */
+#line 2875 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 234:
-#line 615 "./util/configparser.y" /* yacc.c:1646  */
+  case 244:
+#line 635 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_udp_upstream_without_downstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2834,11 +2883,11 @@ yyreduce:
 		else cfg_parser->cfg->udp_upstream_without_downstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2838 "util/configparser.c" /* yacc.c:1646  */
+#line 2887 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 235:
-#line 624 "./util/configparser.y" /* yacc.c:1646  */
+  case 245:
+#line 644 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ssl_upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2846,31 +2895,31 @@ yyreduce:
 		else cfg_parser->cfg->ssl_upstream = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2850 "util/configparser.c" /* yacc.c:1646  */
+#line 2899 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 236:
-#line 633 "./util/configparser.y" /* yacc.c:1646  */
+  case 246:
+#line 653 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ssl_service_key:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ssl_service_key);
 		cfg_parser->cfg->ssl_service_key = (yyvsp[0].str);
 	}
-#line 2860 "util/configparser.c" /* yacc.c:1646  */
+#line 2909 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 237:
-#line 640 "./util/configparser.y" /* yacc.c:1646  */
+  case 247:
+#line 660 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ssl_service_pem:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->ssl_service_pem);
 		cfg_parser->cfg->ssl_service_pem = (yyvsp[0].str);
 	}
-#line 2870 "util/configparser.c" /* yacc.c:1646  */
+#line 2919 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 238:
-#line 647 "./util/configparser.y" /* yacc.c:1646  */
+  case 248:
+#line 667 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ssl_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -2878,11 +2927,11 @@ yyreduce:
 		else cfg_parser->cfg->ssl_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 2882 "util/configparser.c" /* yacc.c:1646  */
+#line 2931 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 239:
-#line 656 "./util/configparser.y" /* yacc.c:1646  */
+  case 249:
+#line 676 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_use_systemd:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2890,11 +2939,11 @@ yyreduce:
 		else cfg_parser->cfg->use_systemd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2894 "util/configparser.c" /* yacc.c:1646  */
+#line 2943 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 240:
-#line 665 "./util/configparser.y" /* yacc.c:1646  */
+  case 250:
+#line 685 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_daemonize:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2902,11 +2951,11 @@ yyreduce:
 		else cfg_parser->cfg->do_daemonize = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2906 "util/configparser.c" /* yacc.c:1646  */
+#line 2955 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 241:
-#line 674 "./util/configparser.y" /* yacc.c:1646  */
+  case 251:
+#line 694 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_use_syslog:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2919,11 +2968,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 2923 "util/configparser.c" /* yacc.c:1646  */
+#line 2972 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 242:
-#line 688 "./util/configparser.y" /* yacc.c:1646  */
+  case 252:
+#line 708 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_log_time_ascii:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2931,11 +2980,11 @@ yyreduce:
 		else cfg_parser->cfg->log_time_ascii = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2935 "util/configparser.c" /* yacc.c:1646  */
+#line 2984 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 243:
-#line 697 "./util/configparser.y" /* yacc.c:1646  */
+  case 253:
+#line 717 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_log_queries:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2943,11 +2992,11 @@ yyreduce:
 		else cfg_parser->cfg->log_queries = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 2947 "util/configparser.c" /* yacc.c:1646  */
+#line 2996 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 244:
-#line 706 "./util/configparser.y" /* yacc.c:1646  */
+  case 254:
+#line 726 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(server_log_replies:%s)\n", (yyvsp[0].str)));
   	if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -2955,31 +3004,31 @@ yyreduce:
   	else cfg_parser->cfg->log_replies = (strcmp((yyvsp[0].str), "yes")==0);
   	free((yyvsp[0].str));
   }
-#line 2959 "util/configparser.c" /* yacc.c:1646  */
+#line 3008 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 245:
-#line 715 "./util/configparser.y" /* yacc.c:1646  */
+  case 255:
+#line 735 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_chroot:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->chrootdir);
 		cfg_parser->cfg->chrootdir = (yyvsp[0].str);
 	}
-#line 2969 "util/configparser.c" /* yacc.c:1646  */
+#line 3018 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 246:
-#line 722 "./util/configparser.y" /* yacc.c:1646  */
+  case 256:
+#line 742 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_username:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->username);
 		cfg_parser->cfg->username = (yyvsp[0].str);
 	}
-#line 2979 "util/configparser.c" /* yacc.c:1646  */
+#line 3028 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 247:
-#line 729 "./util/configparser.y" /* yacc.c:1646  */
+  case 257:
+#line 749 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_directory:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->directory);
@@ -3004,105 +3053,105 @@ yyreduce:
 			}
 		}
 	}
-#line 3008 "util/configparser.c" /* yacc.c:1646  */
+#line 3057 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 248:
-#line 755 "./util/configparser.y" /* yacc.c:1646  */
+  case 258:
+#line 775 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_logfile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->logfile);
 		cfg_parser->cfg->logfile = (yyvsp[0].str);
 		cfg_parser->cfg->use_syslog = 0;
 	}
-#line 3019 "util/configparser.c" /* yacc.c:1646  */
+#line 3068 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 249:
-#line 763 "./util/configparser.y" /* yacc.c:1646  */
+  case 259:
+#line 783 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_pidfile:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->pidfile);
 		cfg_parser->cfg->pidfile = (yyvsp[0].str);
 	}
-#line 3029 "util/configparser.c" /* yacc.c:1646  */
+#line 3078 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 250:
-#line 770 "./util/configparser.y" /* yacc.c:1646  */
+  case 260:
+#line 790 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_root_hints:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3039 "util/configparser.c" /* yacc.c:1646  */
+#line 3088 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 251:
-#line 777 "./util/configparser.y" /* yacc.c:1646  */
+  case 261:
+#line 797 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_dlv_anchor_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dlv_anchor_file);
 		cfg_parser->cfg->dlv_anchor_file = (yyvsp[0].str);
 	}
-#line 3049 "util/configparser.c" /* yacc.c:1646  */
+#line 3098 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 252:
-#line 784 "./util/configparser.y" /* yacc.c:1646  */
+  case 262:
+#line 804 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_dlv_anchor:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3059 "util/configparser.c" /* yacc.c:1646  */
+#line 3108 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 253:
-#line 791 "./util/configparser.y" /* yacc.c:1646  */
+  case 263:
+#line 811 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_auto_trust_anchor_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			auto_trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3070 "util/configparser.c" /* yacc.c:1646  */
+#line 3119 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 254:
-#line 799 "./util/configparser.y" /* yacc.c:1646  */
+  case 264:
+#line 819 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_trust_anchor_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			trust_anchor_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3081 "util/configparser.c" /* yacc.c:1646  */
+#line 3130 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 255:
-#line 807 "./util/configparser.y" /* yacc.c:1646  */
+  case 265:
+#line 827 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_trusted_keys_file:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->
 			trusted_keys_file_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3092 "util/configparser.c" /* yacc.c:1646  */
+#line 3141 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 256:
-#line 815 "./util/configparser.y" /* yacc.c:1646  */
+  case 266:
+#line 835 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_trust_anchor:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3102 "util/configparser.c" /* yacc.c:1646  */
+#line 3151 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 257:
-#line 822 "./util/configparser.y" /* yacc.c:1646  */
+  case 267:
+#line 842 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_trust_anchor_signaling:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3112,21 +3161,21 @@ yyreduce:
 				(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3116 "util/configparser.c" /* yacc.c:1646  */
+#line 3165 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 258:
-#line 833 "./util/configparser.y" /* yacc.c:1646  */
+  case 268:
+#line 853 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_domain_insecure:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3126 "util/configparser.c" /* yacc.c:1646  */
+#line 3175 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 259:
-#line 840 "./util/configparser.y" /* yacc.c:1646  */
+  case 269:
+#line 860 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_hide_identity:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3134,11 +3183,11 @@ yyreduce:
 		else cfg_parser->cfg->hide_identity = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3138 "util/configparser.c" /* yacc.c:1646  */
+#line 3187 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 260:
-#line 849 "./util/configparser.y" /* yacc.c:1646  */
+  case 270:
+#line 869 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_hide_version:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3146,11 +3195,11 @@ yyreduce:
 		else cfg_parser->cfg->hide_version = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3150 "util/configparser.c" /* yacc.c:1646  */
+#line 3199 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 261:
-#line 858 "./util/configparser.y" /* yacc.c:1646  */
+  case 271:
+#line 878 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_hide_trustanchor:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3158,53 +3207,53 @@ yyreduce:
 		else cfg_parser->cfg->hide_trustanchor = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3162 "util/configparser.c" /* yacc.c:1646  */
+#line 3211 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 262:
-#line 867 "./util/configparser.y" /* yacc.c:1646  */
+  case 272:
+#line 887 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->identity);
 		cfg_parser->cfg->identity = (yyvsp[0].str);
 	}
-#line 3172 "util/configparser.c" /* yacc.c:1646  */
+#line 3221 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 263:
-#line 874 "./util/configparser.y" /* yacc.c:1646  */
+  case 273:
+#line 894 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->version);
 		cfg_parser->cfg->version = (yyvsp[0].str);
 	}
-#line 3182 "util/configparser.c" /* yacc.c:1646  */
+#line 3231 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 264:
-#line 881 "./util/configparser.y" /* yacc.c:1646  */
+  case 274:
+#line 901 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_so_rcvbuf:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_rcvbuf))
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 3193 "util/configparser.c" /* yacc.c:1646  */
+#line 3242 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 265:
-#line 889 "./util/configparser.y" /* yacc.c:1646  */
+  case 275:
+#line 909 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_so_sndbuf:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->so_sndbuf))
 			yyerror("buffer size expected");
 		free((yyvsp[0].str));
 	}
-#line 3204 "util/configparser.c" /* yacc.c:1646  */
+#line 3253 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 266:
-#line 897 "./util/configparser.y" /* yacc.c:1646  */
+  case 276:
+#line 917 "./util/configparser.y" /* yacc.c:1646  */
     {
         OUTYY(("P(server_so_reuseport:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3213,11 +3262,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 3217 "util/configparser.c" /* yacc.c:1646  */
+#line 3266 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 267:
-#line 907 "./util/configparser.y" /* yacc.c:1646  */
+  case 277:
+#line 927 "./util/configparser.y" /* yacc.c:1646  */
     {
         OUTYY(("P(server_ip_transparent:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3226,11 +3275,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 3230 "util/configparser.c" /* yacc.c:1646  */
+#line 3279 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 268:
-#line 917 "./util/configparser.y" /* yacc.c:1646  */
+  case 278:
+#line 937 "./util/configparser.y" /* yacc.c:1646  */
     {
         OUTYY(("P(server_ip_freebind:%s)\n", (yyvsp[0].str)));
         if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3239,11 +3288,11 @@ yyreduce:
             (strcmp((yyvsp[0].str), "yes")==0);
         free((yyvsp[0].str));
     }
-#line 3243 "util/configparser.c" /* yacc.c:1646  */
+#line 3292 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 269:
-#line 927 "./util/configparser.y" /* yacc.c:1646  */
+  case 279:
+#line 947 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_edns_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3255,11 +3304,11 @@ yyreduce:
 		else cfg_parser->cfg->edns_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3259 "util/configparser.c" /* yacc.c:1646  */
+#line 3308 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 270:
-#line 940 "./util/configparser.y" /* yacc.c:1646  */
+  case 280:
+#line 960 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_msg_buffer_size:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3269,22 +3318,22 @@ yyreduce:
 		else cfg_parser->cfg->msg_buffer_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3273 "util/configparser.c" /* yacc.c:1646  */
+#line 3322 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 271:
-#line 951 "./util/configparser.y" /* yacc.c:1646  */
+  case 281:
+#line 971 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_msg_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->msg_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3284 "util/configparser.c" /* yacc.c:1646  */
+#line 3333 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 272:
-#line 959 "./util/configparser.y" /* yacc.c:1646  */
+  case 282:
+#line 979 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_msg_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3296,11 +3345,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 3300 "util/configparser.c" /* yacc.c:1646  */
+#line 3349 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 273:
-#line 972 "./util/configparser.y" /* yacc.c:1646  */
+  case 283:
+#line 992 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_num_queries_per_thread:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3308,11 +3357,11 @@ yyreduce:
 		else cfg_parser->cfg->num_queries_per_thread = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3312 "util/configparser.c" /* yacc.c:1646  */
+#line 3361 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 274:
-#line 981 "./util/configparser.y" /* yacc.c:1646  */
+  case 284:
+#line 1001 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_jostle_timeout:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3320,11 +3369,11 @@ yyreduce:
 		else cfg_parser->cfg->jostle_time = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3324 "util/configparser.c" /* yacc.c:1646  */
+#line 3373 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 275:
-#line 990 "./util/configparser.y" /* yacc.c:1646  */
+  case 285:
+#line 1010 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_delay_close:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3332,11 +3381,11 @@ yyreduce:
 		else cfg_parser->cfg->delay_close = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3336 "util/configparser.c" /* yacc.c:1646  */
+#line 3385 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 276:
-#line 999 "./util/configparser.y" /* yacc.c:1646  */
+  case 286:
+#line 1019 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_unblock_lan_zones:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3345,11 +3394,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3349 "util/configparser.c" /* yacc.c:1646  */
+#line 3398 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 277:
-#line 1009 "./util/configparser.y" /* yacc.c:1646  */
+  case 287:
+#line 1029 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_insecure_lan_zones:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3358,22 +3407,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3362 "util/configparser.c" /* yacc.c:1646  */
+#line 3411 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 278:
-#line 1019 "./util/configparser.y" /* yacc.c:1646  */
+  case 288:
+#line 1039 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_rrset_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->rrset_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3373 "util/configparser.c" /* yacc.c:1646  */
+#line 3422 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 279:
-#line 1027 "./util/configparser.y" /* yacc.c:1646  */
+  case 289:
+#line 1047 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_rrset_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3385,11 +3434,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 3389 "util/configparser.c" /* yacc.c:1646  */
+#line 3438 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 280:
-#line 1040 "./util/configparser.y" /* yacc.c:1646  */
+  case 290:
+#line 1060 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_host_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3397,22 +3446,22 @@ yyreduce:
 		else cfg_parser->cfg->host_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3401 "util/configparser.c" /* yacc.c:1646  */
+#line 3450 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 281:
-#line 1049 "./util/configparser.y" /* yacc.c:1646  */
+  case 291:
+#line 1069 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_lame_ttl:%s)\n", (yyvsp[0].str)));
 		verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option "
 			"removed, use infra-host-ttl)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3412 "util/configparser.c" /* yacc.c:1646  */
+#line 3461 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 282:
-#line 1057 "./util/configparser.y" /* yacc.c:1646  */
+  case 292:
+#line 1077 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_cache_numhosts:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3420,22 +3469,22 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_numhosts = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3424 "util/configparser.c" /* yacc.c:1646  */
+#line 3473 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 283:
-#line 1066 "./util/configparser.y" /* yacc.c:1646  */
+  case 293:
+#line 1086 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_cache_lame_size:%s)\n", (yyvsp[0].str)));
 		verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s "
 			"(option removed, use infra-cache-numhosts)", (yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3435 "util/configparser.c" /* yacc.c:1646  */
+#line 3484 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 284:
-#line 1074 "./util/configparser.y" /* yacc.c:1646  */
+  case 294:
+#line 1094 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3447,11 +3496,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 3451 "util/configparser.c" /* yacc.c:1646  */
+#line 3500 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 285:
-#line 1087 "./util/configparser.y" /* yacc.c:1646  */
+  case 295:
+#line 1107 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_infra_cache_min_rtt:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3459,21 +3508,21 @@ yyreduce:
 		else cfg_parser->cfg->infra_cache_min_rtt = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3463 "util/configparser.c" /* yacc.c:1646  */
+#line 3512 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 286:
-#line 1096 "./util/configparser.y" /* yacc.c:1646  */
+  case 296:
+#line 1116 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_target_fetch_policy:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->target_fetch_policy);
 		cfg_parser->cfg->target_fetch_policy = (yyvsp[0].str);
 	}
-#line 3473 "util/configparser.c" /* yacc.c:1646  */
+#line 3522 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 287:
-#line 1103 "./util/configparser.y" /* yacc.c:1646  */
+  case 297:
+#line 1123 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_short_bufsize:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3482,11 +3531,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3486 "util/configparser.c" /* yacc.c:1646  */
+#line 3535 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 288:
-#line 1113 "./util/configparser.y" /* yacc.c:1646  */
+  case 298:
+#line 1133 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_large_queries:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3495,11 +3544,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3499 "util/configparser.c" /* yacc.c:1646  */
+#line 3548 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 289:
-#line 1123 "./util/configparser.y" /* yacc.c:1646  */
+  case 299:
+#line 1143 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_glue:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3508,11 +3557,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3512 "util/configparser.c" /* yacc.c:1646  */
+#line 3561 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 290:
-#line 1133 "./util/configparser.y" /* yacc.c:1646  */
+  case 300:
+#line 1153 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_dnssec_stripped:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3521,11 +3570,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3525 "util/configparser.c" /* yacc.c:1646  */
+#line 3574 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 291:
-#line 1143 "./util/configparser.y" /* yacc.c:1646  */
+  case 301:
+#line 1163 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_below_nxdomain:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3534,11 +3583,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3538 "util/configparser.c" /* yacc.c:1646  */
+#line 3587 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 292:
-#line 1153 "./util/configparser.y" /* yacc.c:1646  */
+  case 302:
+#line 1173 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_referral_path:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3547,11 +3596,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3551 "util/configparser.c" /* yacc.c:1646  */
+#line 3600 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 293:
-#line 1163 "./util/configparser.y" /* yacc.c:1646  */
+  case 303:
+#line 1183 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_harden_algo_downgrade:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3560,11 +3609,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3564 "util/configparser.c" /* yacc.c:1646  */
+#line 3613 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 294:
-#line 1173 "./util/configparser.y" /* yacc.c:1646  */
+  case 304:
+#line 1193 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_use_caps_for_id:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3573,41 +3622,41 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3577 "util/configparser.c" /* yacc.c:1646  */
+#line 3626 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 295:
-#line 1183 "./util/configparser.y" /* yacc.c:1646  */
+  case 305:
+#line 1203 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_caps_whitelist:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->caps_whitelist, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3587 "util/configparser.c" /* yacc.c:1646  */
+#line 3636 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 296:
-#line 1190 "./util/configparser.y" /* yacc.c:1646  */
+  case 306:
+#line 1210 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_private_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3597 "util/configparser.c" /* yacc.c:1646  */
+#line 3646 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 297:
-#line 1197 "./util/configparser.y" /* yacc.c:1646  */
+  case 307:
+#line 1217 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_private_domain:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3607 "util/configparser.c" /* yacc.c:1646  */
+#line 3656 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 298:
-#line 1204 "./util/configparser.y" /* yacc.c:1646  */
+  case 308:
+#line 1224 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_prefetch:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3615,11 +3664,11 @@ yyreduce:
 		else cfg_parser->cfg->prefetch = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3619 "util/configparser.c" /* yacc.c:1646  */
+#line 3668 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 299:
-#line 1213 "./util/configparser.y" /* yacc.c:1646  */
+  case 309:
+#line 1233 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_prefetch_key:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3627,11 +3676,11 @@ yyreduce:
 		else cfg_parser->cfg->prefetch_key = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3631 "util/configparser.c" /* yacc.c:1646  */
+#line 3680 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 300:
-#line 1222 "./util/configparser.y" /* yacc.c:1646  */
+  case 310:
+#line 1242 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_unwanted_reply_threshold:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3639,21 +3688,21 @@ yyreduce:
 		else cfg_parser->cfg->unwanted_threshold = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3643 "util/configparser.c" /* yacc.c:1646  */
+#line 3692 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 301:
-#line 1231 "./util/configparser.y" /* yacc.c:1646  */
+  case 311:
+#line 1251 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_not_query_address:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 3653 "util/configparser.c" /* yacc.c:1646  */
+#line 3702 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 302:
-#line 1238 "./util/configparser.y" /* yacc.c:1646  */
+  case 312:
+#line 1258 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_do_not_query_localhost:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3662,11 +3711,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3666 "util/configparser.c" /* yacc.c:1646  */
+#line 3715 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 303:
-#line 1248 "./util/configparser.y" /* yacc.c:1646  */
+  case 313:
+#line 1268 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_access_control:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "deny")!=0 && strcmp((yyvsp[0].str), "refuse")!=0 &&
@@ -3682,21 +3731,21 @@ yyreduce:
 				fatal_exit("out of memory adding acl");
 		}
 	}
-#line 3686 "util/configparser.c" /* yacc.c:1646  */
+#line 3735 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 304:
-#line 1265 "./util/configparser.y" /* yacc.c:1646  */
+  case 314:
+#line 1285 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_module_conf:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->module_conf);
 		cfg_parser->cfg->module_conf = (yyvsp[0].str);
 	}
-#line 3696 "util/configparser.c" /* yacc.c:1646  */
+#line 3745 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 305:
-#line 1272 "./util/configparser.y" /* yacc.c:1646  */
+  case 315:
+#line 1292 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_override_date:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -3713,11 +3762,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 3717 "util/configparser.c" /* yacc.c:1646  */
+#line 3766 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 306:
-#line 1290 "./util/configparser.y" /* yacc.c:1646  */
+  case 316:
+#line 1310 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_sig_skew_min:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -3729,11 +3778,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 3733 "util/configparser.c" /* yacc.c:1646  */
+#line 3782 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 307:
-#line 1303 "./util/configparser.y" /* yacc.c:1646  */
+  case 317:
+#line 1323 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_sig_skew_max:%s)\n", (yyvsp[0].str)));
 		if(*(yyvsp[0].str) == '\0' || strcmp((yyvsp[0].str), "0") == 0) {
@@ -3745,11 +3794,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 3749 "util/configparser.c" /* yacc.c:1646  */
+#line 3798 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 308:
-#line 1316 "./util/configparser.y" /* yacc.c:1646  */
+  case 318:
+#line 1336 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_cache_max_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3757,11 +3806,11 @@ yyreduce:
 		else cfg_parser->cfg->max_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3761 "util/configparser.c" /* yacc.c:1646  */
+#line 3810 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 309:
-#line 1325 "./util/configparser.y" /* yacc.c:1646  */
+  case 319:
+#line 1345 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_cache_max_negative_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3769,11 +3818,11 @@ yyreduce:
 		else cfg_parser->cfg->max_negative_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3773 "util/configparser.c" /* yacc.c:1646  */
+#line 3822 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 310:
-#line 1334 "./util/configparser.y" /* yacc.c:1646  */
+  case 320:
+#line 1354 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_cache_min_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3781,11 +3830,11 @@ yyreduce:
 		else cfg_parser->cfg->min_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3785 "util/configparser.c" /* yacc.c:1646  */
+#line 3834 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 311:
-#line 1343 "./util/configparser.y" /* yacc.c:1646  */
+  case 321:
+#line 1363 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_bogus_ttl:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3793,11 +3842,11 @@ yyreduce:
 		else cfg_parser->cfg->bogus_ttl = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3797 "util/configparser.c" /* yacc.c:1646  */
+#line 3846 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 312:
-#line 1352 "./util/configparser.y" /* yacc.c:1646  */
+  case 322:
+#line 1372 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_clean_additional:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3806,11 +3855,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3810 "util/configparser.c" /* yacc.c:1646  */
+#line 3859 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 313:
-#line 1362 "./util/configparser.y" /* yacc.c:1646  */
+  case 323:
+#line 1382 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_permissive_mode:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3819,11 +3868,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3823 "util/configparser.c" /* yacc.c:1646  */
+#line 3872 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 314:
-#line 1372 "./util/configparser.y" /* yacc.c:1646  */
+  case 324:
+#line 1392 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ignore_cd_flag:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3831,11 +3880,11 @@ yyreduce:
 		else cfg_parser->cfg->ignore_cd = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3835 "util/configparser.c" /* yacc.c:1646  */
+#line 3884 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 315:
-#line 1381 "./util/configparser.y" /* yacc.c:1646  */
+  case 325:
+#line 1401 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_serve_expired:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3843,11 +3892,11 @@ yyreduce:
 		else cfg_parser->cfg->serve_expired = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3847 "util/configparser.c" /* yacc.c:1646  */
+#line 3896 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 316:
-#line 1390 "./util/configparser.y" /* yacc.c:1646  */
+  case 326:
+#line 1410 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_fake_dsa:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3859,11 +3908,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 3863 "util/configparser.c" /* yacc.c:1646  */
+#line 3912 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 317:
-#line 1403 "./util/configparser.y" /* yacc.c:1646  */
+  case 327:
+#line 1423 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_fake_sha1:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3875,11 +3924,11 @@ yyreduce:
 #endif
 		free((yyvsp[0].str));
 	}
-#line 3879 "util/configparser.c" /* yacc.c:1646  */
+#line 3928 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 318:
-#line 1416 "./util/configparser.y" /* yacc.c:1646  */
+  case 328:
+#line 1436 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_log_level:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3887,21 +3936,21 @@ yyreduce:
 		else cfg_parser->cfg->val_log_level = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3891 "util/configparser.c" /* yacc.c:1646  */
+#line 3940 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 319:
-#line 1425 "./util/configparser.y" /* yacc.c:1646  */
+  case 329:
+#line 1445 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->val_nsec3_key_iterations);
 		cfg_parser->cfg->val_nsec3_key_iterations = (yyvsp[0].str);
 	}
-#line 3901 "util/configparser.c" /* yacc.c:1646  */
+#line 3950 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 320:
-#line 1432 "./util/configparser.y" /* yacc.c:1646  */
+  case 330:
+#line 1452 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_add_holddown:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3909,11 +3958,11 @@ yyreduce:
 		else cfg_parser->cfg->add_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3913 "util/configparser.c" /* yacc.c:1646  */
+#line 3962 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 321:
-#line 1441 "./util/configparser.y" /* yacc.c:1646  */
+  case 331:
+#line 1461 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_del_holddown:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3921,11 +3970,11 @@ yyreduce:
 		else cfg_parser->cfg->del_holddown = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3925 "util/configparser.c" /* yacc.c:1646  */
+#line 3974 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 322:
-#line 1450 "./util/configparser.y" /* yacc.c:1646  */
+  case 332:
+#line 1470 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_keep_missing:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -3933,11 +3982,11 @@ yyreduce:
 		else cfg_parser->cfg->keep_missing = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 3937 "util/configparser.c" /* yacc.c:1646  */
+#line 3986 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 323:
-#line 1459 "./util/configparser.y" /* yacc.c:1646  */
+  case 333:
+#line 1479 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_permit_small_holddown:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -3946,22 +3995,22 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 3950 "util/configparser.c" /* yacc.c:1646  */
+#line 3999 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 324:
-#line 1468 "./util/configparser.y" /* yacc.c:1646  */
+  case 334:
+#line 1488 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_key_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->key_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3961 "util/configparser.c" /* yacc.c:1646  */
+#line 4010 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 325:
-#line 1476 "./util/configparser.y" /* yacc.c:1646  */
+  case 335:
+#line 1496 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_key_cache_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -3973,22 +4022,22 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 3977 "util/configparser.c" /* yacc.c:1646  */
+#line 4026 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 326:
-#line 1489 "./util/configparser.y" /* yacc.c:1646  */
+  case 336:
+#line 1509 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_neg_cache_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->neg_cache_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 3988 "util/configparser.c" /* yacc.c:1646  */
+#line 4037 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 327:
-#line 1497 "./util/configparser.y" /* yacc.c:1646  */
+  case 337:
+#line 1517 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
@@ -4015,21 +4064,21 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 4019 "util/configparser.c" /* yacc.c:1646  */
+#line 4068 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 328:
-#line 1525 "./util/configparser.y" /* yacc.c:1646  */
+  case 338:
+#line 1545 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, (yyvsp[0].str)))
 			fatal_exit("out of memory adding local-data");
 	}
-#line 4029 "util/configparser.c" /* yacc.c:1646  */
+#line 4078 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 329:
-#line 1532 "./util/configparser.y" /* yacc.c:1646  */
+  case 339:
+#line 1552 "./util/configparser.y" /* yacc.c:1646  */
     {
 		char* ptr;
 		OUTYY(("P(server_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -4043,11 +4092,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 4047 "util/configparser.c" /* yacc.c:1646  */
+#line 4096 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 330:
-#line 1547 "./util/configparser.y" /* yacc.c:1646  */
+  case 340:
+#line 1567 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_minimal_responses:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4056,11 +4105,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4060 "util/configparser.c" /* yacc.c:1646  */
+#line 4109 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 331:
-#line 1557 "./util/configparser.y" /* yacc.c:1646  */
+  case 341:
+#line 1577 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_rrset_roundrobin:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4069,31 +4118,31 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4073 "util/configparser.c" /* yacc.c:1646  */
+#line 4122 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 332:
-#line 1567 "./util/configparser.y" /* yacc.c:1646  */
+  case 342:
+#line 1587 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_max_udp_size:%s)\n", (yyvsp[0].str)));
 		cfg_parser->cfg->max_udp_size = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4083 "util/configparser.c" /* yacc.c:1646  */
+#line 4132 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 333:
-#line 1574 "./util/configparser.y" /* yacc.c:1646  */
+  case 343:
+#line 1594 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dns64_prefix:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dns64_prefix);
 		cfg_parser->cfg->dns64_prefix = (yyvsp[0].str);
 	}
-#line 4093 "util/configparser.c" /* yacc.c:1646  */
+#line 4142 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 334:
-#line 1581 "./util/configparser.y" /* yacc.c:1646  */
+  case 344:
+#line 1601 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_dns64_synthall:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4101,11 +4150,11 @@ yyreduce:
 		else cfg_parser->cfg->dns64_synthall = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4105 "util/configparser.c" /* yacc.c:1646  */
+#line 4154 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 335:
-#line 1590 "./util/configparser.y" /* yacc.c:1646  */
+  case 345:
+#line 1610 "./util/configparser.y" /* yacc.c:1646  */
     {
 		char* p, *s = (yyvsp[0].str);
 		OUTYY(("P(server_define_tag:%s)\n", (yyvsp[0].str)));
@@ -4118,11 +4167,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4122 "util/configparser.c" /* yacc.c:1646  */
+#line 4171 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 336:
-#line 1604 "./util/configparser.y" /* yacc.c:1646  */
+  case 346:
+#line 1624 "./util/configparser.y" /* yacc.c:1646  */
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -4140,11 +4189,11 @@ yyreduce:
 			}
 		}
 	}
-#line 4144 "util/configparser.c" /* yacc.c:1646  */
+#line 4193 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 337:
-#line 1623 "./util/configparser.y" /* yacc.c:1646  */
+  case 347:
+#line 1643 "./util/configparser.y" /* yacc.c:1646  */
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -4162,11 +4211,11 @@ yyreduce:
 			}
 		}
 	}
-#line 4166 "util/configparser.c" /* yacc.c:1646  */
+#line 4215 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 338:
-#line 1642 "./util/configparser.y" /* yacc.c:1646  */
+  case 348:
+#line 1662 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_access_control_tag_action:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_actions,
@@ -4177,11 +4226,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 4181 "util/configparser.c" /* yacc.c:1646  */
+#line 4230 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 339:
-#line 1654 "./util/configparser.y" /* yacc.c:1646  */
+  case 349:
+#line 1674 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_access_control_tag_data:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->acl_tag_datas,
@@ -4192,11 +4241,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 4196 "util/configparser.c" /* yacc.c:1646  */
+#line 4245 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 340:
-#line 1666 "./util/configparser.y" /* yacc.c:1646  */
+  case 350:
+#line 1686 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_local_zone_override:%s %s %s)\n", (yyvsp[-2].str), (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str3list_insert(&cfg_parser->cfg->local_zone_overrides,
@@ -4207,11 +4256,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 4211 "util/configparser.c" /* yacc.c:1646  */
+#line 4260 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 341:
-#line 1678 "./util/configparser.y" /* yacc.c:1646  */
+  case 351:
+#line 1698 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_access_control_view:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(!cfg_str2list_insert(&cfg_parser->cfg->acl_view,
@@ -4221,11 +4270,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 4225 "util/configparser.c" /* yacc.c:1646  */
+#line 4274 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 342:
-#line 1689 "./util/configparser.y" /* yacc.c:1646  */
+  case 352:
+#line 1709 "./util/configparser.y" /* yacc.c:1646  */
     {
 		size_t len = 0;
 		uint8_t* bitlist = config_parse_taglist(cfg_parser->cfg, (yyvsp[0].str),
@@ -4243,11 +4292,11 @@ yyreduce:
 			}
 		}
 	}
-#line 4247 "util/configparser.c" /* yacc.c:1646  */
+#line 4296 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 343:
-#line 1708 "./util/configparser.y" /* yacc.c:1646  */
+  case 353:
+#line 1728 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_ip_ratelimit:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4255,11 +4304,11 @@ yyreduce:
 		else cfg_parser->cfg->ip_ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4259 "util/configparser.c" /* yacc.c:1646  */
+#line 4308 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 344:
-#line 1718 "./util/configparser.y" /* yacc.c:1646  */
+  case 354:
+#line 1738 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_ratelimit:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4267,33 +4316,33 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4271 "util/configparser.c" /* yacc.c:1646  */
+#line 4320 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 345:
-#line 1727 "./util/configparser.y" /* yacc.c:1646  */
+  case 355:
+#line 1747 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(server_ip_ratelimit_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ip_ratelimit_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 4282 "util/configparser.c" /* yacc.c:1646  */
+#line 4331 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 346:
-#line 1735 "./util/configparser.y" /* yacc.c:1646  */
+  case 356:
+#line 1755 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ratelimit_size:%s)\n", (yyvsp[0].str)));
 		if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->ratelimit_size))
 			yyerror("memory size expected");
 		free((yyvsp[0].str));
 	}
-#line 4293 "util/configparser.c" /* yacc.c:1646  */
+#line 4342 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 347:
-#line 1743 "./util/configparser.y" /* yacc.c:1646  */
+  case 357:
+#line 1763 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -4305,11 +4354,11 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 4309 "util/configparser.c" /* yacc.c:1646  */
+#line 4358 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 348:
-#line 1756 "./util/configparser.y" /* yacc.c:1646  */
+  case 358:
+#line 1776 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ratelimit_slabs:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4321,11 +4370,11 @@ yyreduce:
 		}
 		free((yyvsp[0].str));
 	}
-#line 4325 "util/configparser.c" /* yacc.c:1646  */
+#line 4374 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 349:
-#line 1769 "./util/configparser.y" /* yacc.c:1646  */
+  case 359:
+#line 1789 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ratelimit_for_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
@@ -4337,11 +4386,11 @@ yyreduce:
 					"ratelimit-for-domain");
 		}
 	}
-#line 4341 "util/configparser.c" /* yacc.c:1646  */
+#line 4390 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 350:
-#line 1782 "./util/configparser.y" /* yacc.c:1646  */
+  case 360:
+#line 1802 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_ratelimit_below_domain:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0) {
@@ -4353,11 +4402,11 @@ yyreduce:
 					"ratelimit-below-domain");
 		}
 	}
-#line 4357 "util/configparser.c" /* yacc.c:1646  */
+#line 4406 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 351:
-#line 1795 "./util/configparser.y" /* yacc.c:1646  */
+  case 361:
+#line 1815 "./util/configparser.y" /* yacc.c:1646  */
     { 
   	OUTYY(("P(server_ip_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
   	if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4365,11 +4414,11 @@ yyreduce:
   	else cfg_parser->cfg->ip_ratelimit_factor = atoi((yyvsp[0].str));
   	free((yyvsp[0].str));
 	}
-#line 4369 "util/configparser.c" /* yacc.c:1646  */
+#line 4418 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 352:
-#line 1804 "./util/configparser.y" /* yacc.c:1646  */
+  case 362:
+#line 1824 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("P(server_ratelimit_factor:%s)\n", (yyvsp[0].str))); 
 		if(atoi((yyvsp[0].str)) == 0 && strcmp((yyvsp[0].str), "0") != 0)
@@ -4377,11 +4426,11 @@ yyreduce:
 		else cfg_parser->cfg->ratelimit_factor = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4381 "util/configparser.c" /* yacc.c:1646  */
+#line 4430 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 353:
-#line 1813 "./util/configparser.y" /* yacc.c:1646  */
+  case 363:
+#line 1833 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_qname_minimisation:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4390,11 +4439,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4394 "util/configparser.c" /* yacc.c:1646  */
+#line 4443 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 354:
-#line 1823 "./util/configparser.y" /* yacc.c:1646  */
+  case 364:
+#line 1843 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_qname_minimisation_strict:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4403,11 +4452,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4407 "util/configparser.c" /* yacc.c:1646  */
+#line 4456 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 355:
-#line 1833 "./util/configparser.y" /* yacc.c:1646  */
+  case 365:
+#line 1853 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_enabled:%s)\n", (yyvsp[0].str)));
@@ -4419,11 +4468,11 @@ yyreduce:
 		OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
 	#endif
 	}
-#line 4423 "util/configparser.c" /* yacc.c:1646  */
+#line 4472 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 356:
-#line 1846 "./util/configparser.y" /* yacc.c:1646  */
+  case 366:
+#line 1866 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_ignore_bogus:%s)\n", (yyvsp[0].str)));
@@ -4435,11 +4484,11 @@ yyreduce:
 		OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
 	#endif
 	}
-#line 4439 "util/configparser.c" /* yacc.c:1646  */
+#line 4488 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 357:
-#line 1859 "./util/configparser.y" /* yacc.c:1646  */
+  case 367:
+#line 1879 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_hook:%s)\n", (yyvsp[0].str)));
@@ -4449,11 +4498,11 @@ yyreduce:
 		OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
 	#endif
 	}
-#line 4453 "util/configparser.c" /* yacc.c:1646  */
+#line 4502 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 358:
-#line 1870 "./util/configparser.y" /* yacc.c:1646  */
+  case 368:
+#line 1890 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_max_ttl:%s)\n", (yyvsp[0].str)));
@@ -4465,11 +4514,11 @@ yyreduce:
 		OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
 	#endif
 	}
-#line 4469 "util/configparser.c" /* yacc.c:1646  */
+#line 4518 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 359:
-#line 1883 "./util/configparser.y" /* yacc.c:1646  */
+  case 369:
+#line 1903 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_whitelist:%s)\n", (yyvsp[0].str)));
@@ -4479,11 +4528,11 @@ yyreduce:
 		OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
 	#endif
 	}
-#line 4483 "util/configparser.c" /* yacc.c:1646  */
+#line 4532 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 360:
-#line 1894 "./util/configparser.y" /* yacc.c:1646  */
+  case 370:
+#line 1914 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_IPSECMOD
 		OUTYY(("P(server_ipsecmod_strict:%s)\n", (yyvsp[0].str)));
@@ -4495,11 +4544,11 @@ yyreduce:
 		OUTYY(("P(Compiled without IPsec module, ignoring)\n"));
 	#endif
 	}
-#line 4499 "util/configparser.c" /* yacc.c:1646  */
+#line 4548 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 361:
-#line 1907 "./util/configparser.y" /* yacc.c:1646  */
+  case 371:
+#line 1927 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->stubs->name)
@@ -4508,31 +4557,31 @@ yyreduce:
 		free(cfg_parser->cfg->stubs->name);
 		cfg_parser->cfg->stubs->name = (yyvsp[0].str);
 	}
-#line 4512 "util/configparser.c" /* yacc.c:1646  */
+#line 4561 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 362:
-#line 1917 "./util/configparser.y" /* yacc.c:1646  */
+  case 372:
+#line 1937 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4522 "util/configparser.c" /* yacc.c:1646  */
+#line 4571 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 363:
-#line 1924 "./util/configparser.y" /* yacc.c:1646  */
+  case 373:
+#line 1944 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4532 "util/configparser.c" /* yacc.c:1646  */
+#line 4581 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 364:
-#line 1931 "./util/configparser.y" /* yacc.c:1646  */
+  case 374:
+#line 1951 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4540,11 +4589,11 @@ yyreduce:
 		else cfg_parser->cfg->stubs->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4544 "util/configparser.c" /* yacc.c:1646  */
+#line 4593 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 365:
-#line 1940 "./util/configparser.y" /* yacc.c:1646  */
+  case 375:
+#line 1960 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4553,11 +4602,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4557 "util/configparser.c" /* yacc.c:1646  */
+#line 4606 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 366:
-#line 1950 "./util/configparser.y" /* yacc.c:1646  */
+  case 376:
+#line 1970 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(stub-prime:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4566,11 +4615,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4570 "util/configparser.c" /* yacc.c:1646  */
+#line 4619 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 367:
-#line 1960 "./util/configparser.y" /* yacc.c:1646  */
+  case 377:
+#line 1980 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->forwards->name)
@@ -4579,31 +4628,31 @@ yyreduce:
 		free(cfg_parser->cfg->forwards->name);
 		cfg_parser->cfg->forwards->name = (yyvsp[0].str);
 	}
-#line 4583 "util/configparser.c" /* yacc.c:1646  */
+#line 4632 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 368:
-#line 1970 "./util/configparser.y" /* yacc.c:1646  */
+  case 378:
+#line 1990 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(forward-host:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4593 "util/configparser.c" /* yacc.c:1646  */
+#line 4642 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 369:
-#line 1977 "./util/configparser.y" /* yacc.c:1646  */
+  case 379:
+#line 1997 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(forward-addr:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4603 "util/configparser.c" /* yacc.c:1646  */
+#line 4652 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 370:
-#line 1984 "./util/configparser.y" /* yacc.c:1646  */
+  case 380:
+#line 2004 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(forward-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4611,11 +4660,11 @@ yyreduce:
 		else cfg_parser->cfg->forwards->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4615 "util/configparser.c" /* yacc.c:1646  */
+#line 4664 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 371:
-#line 1993 "./util/configparser.y" /* yacc.c:1646  */
+  case 381:
+#line 2013 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(forward-ssl-upstream:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4624,11 +4673,80 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4628 "util/configparser.c" /* yacc.c:1646  */
+#line 4677 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 372:
-#line 2003 "./util/configparser.y" /* yacc.c:1646  */
+  case 382:
+#line 2023 "./util/configparser.y" /* yacc.c:1646  */
+    {
+		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
+		if(cfg_parser->cfg->auths->name)
+			yyerror("auth name override, there must be one name "
+				"for one auth-zone");
+		free(cfg_parser->cfg->auths->name);
+		cfg_parser->cfg->auths->name = (yyvsp[0].str);
+	}
+#line 4690 "util/configparser.c" /* yacc.c:1646  */
+    break;
+
+  case 383:
+#line 2033 "./util/configparser.y" /* yacc.c:1646  */
+    {
+		OUTYY(("P(zonefile:%s)\n", (yyvsp[0].str)));
+		free(cfg_parser->cfg->auths->zonefile);
+		cfg_parser->cfg->auths->zonefile = (yyvsp[0].str);
+	}
+#line 4700 "util/configparser.c" /* yacc.c:1646  */
+    break;
+
+  case 384:
+#line 2040 "./util/configparser.y" /* yacc.c:1646  */
+    {
+		OUTYY(("P(master:%s)\n", (yyvsp[0].str)));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->masters, (yyvsp[0].str)))
+			yyerror("out of memory");
+	}
+#line 4710 "util/configparser.c" /* yacc.c:1646  */
+    break;
+
+  case 385:
+#line 2047 "./util/configparser.y" /* yacc.c:1646  */
+    {
+		OUTYY(("P(url:%s)\n", (yyvsp[0].str)));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->urls, (yyvsp[0].str)))
+			yyerror("out of memory");
+	}
+#line 4720 "util/configparser.c" /* yacc.c:1646  */
+    break;
+
+  case 386:
+#line 2054 "./util/configparser.y" /* yacc.c:1646  */
+    {
+		OUTYY(("P(for-downstream:%s)\n", (yyvsp[0].str)));
+		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->auths->for_downstream =
+			(strcmp((yyvsp[0].str), "yes")==0);
+		free((yyvsp[0].str));
+	}
+#line 4733 "util/configparser.c" /* yacc.c:1646  */
+    break;
+
+  case 387:
+#line 2064 "./util/configparser.y" /* yacc.c:1646  */
+    {
+		OUTYY(("P(for-upstream:%s)\n", (yyvsp[0].str)));
+		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->auths->for_upstream =
+			(strcmp((yyvsp[0].str), "yes")==0);
+		free((yyvsp[0].str));
+	}
+#line 4746 "util/configparser.c" /* yacc.c:1646  */
+    break;
+
+  case 388:
+#line 2074 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(name:%s)\n", (yyvsp[0].str)));
 		if(cfg_parser->cfg->views->name)
@@ -4637,11 +4755,11 @@ yyreduce:
 		free(cfg_parser->cfg->views->name);
 		cfg_parser->cfg->views->name = (yyvsp[0].str);
 	}
-#line 4641 "util/configparser.c" /* yacc.c:1646  */
+#line 4759 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 373:
-#line 2013 "./util/configparser.y" /* yacc.c:1646  */
+  case 389:
+#line 2084 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(view_local_zone:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "static")!=0 && strcmp((yyvsp[0].str), "deny")!=0 &&
@@ -4669,11 +4787,11 @@ yyreduce:
 				fatal_exit("out of memory adding local-zone");
 		}
 	}
-#line 4673 "util/configparser.c" /* yacc.c:1646  */
+#line 4791 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 374:
-#line 2042 "./util/configparser.y" /* yacc.c:1646  */
+  case 390:
+#line 2113 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(view_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -4682,22 +4800,22 @@ yyreduce:
 			fatal_exit("out of memory adding per-view "
 				"response-ip action");
 	}
-#line 4686 "util/configparser.c" /* yacc.c:1646  */
+#line 4804 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 375:
-#line 2052 "./util/configparser.y" /* yacc.c:1646  */
+  case 391:
+#line 2123 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(view_response_ip_data:%s)\n", (yyvsp[-1].str)));
 		if(!cfg_str2list_insert(
 			&cfg_parser->cfg->views->respip_data, (yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip-data");
 	}
-#line 4697 "util/configparser.c" /* yacc.c:1646  */
+#line 4815 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 376:
-#line 2060 "./util/configparser.y" /* yacc.c:1646  */
+  case 392:
+#line 2131 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(view_local_data:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->views->local_data, (yyvsp[0].str))) {
@@ -4705,11 +4823,11 @@ yyreduce:
 			free((yyvsp[0].str));
 		}
 	}
-#line 4709 "util/configparser.c" /* yacc.c:1646  */
+#line 4827 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 377:
-#line 2069 "./util/configparser.y" /* yacc.c:1646  */
+  case 393:
+#line 2140 "./util/configparser.y" /* yacc.c:1646  */
     {
 		char* ptr;
 		OUTYY(("P(view_local_data_ptr:%s)\n", (yyvsp[0].str)));
@@ -4723,11 +4841,11 @@ yyreduce:
 			yyerror("local-data-ptr could not be reversed");
 		}
 	}
-#line 4727 "util/configparser.c" /* yacc.c:1646  */
+#line 4845 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 378:
-#line 2084 "./util/configparser.y" /* yacc.c:1646  */
+  case 394:
+#line 2155 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(view-first:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4735,19 +4853,19 @@ yyreduce:
 		else cfg_parser->cfg->views->isfirst=(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4739 "util/configparser.c" /* yacc.c:1646  */
+#line 4857 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 379:
-#line 2093 "./util/configparser.y" /* yacc.c:1646  */
+  case 395:
+#line 2164 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("\nP(remote-control:)\n")); 
 	}
-#line 4747 "util/configparser.c" /* yacc.c:1646  */
+#line 4865 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 390:
-#line 2104 "./util/configparser.y" /* yacc.c:1646  */
+  case 406:
+#line 2175 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(control_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4756,11 +4874,11 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4760 "util/configparser.c" /* yacc.c:1646  */
+#line 4878 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 391:
-#line 2114 "./util/configparser.y" /* yacc.c:1646  */
+  case 407:
+#line 2185 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(control_port:%s)\n", (yyvsp[0].str)));
 		if(atoi((yyvsp[0].str)) == 0)
@@ -4768,21 +4886,21 @@ yyreduce:
 		else cfg_parser->cfg->control_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 4772 "util/configparser.c" /* yacc.c:1646  */
+#line 4890 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 392:
-#line 2123 "./util/configparser.y" /* yacc.c:1646  */
+  case 408:
+#line 2194 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(control_interface:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->control_ifs, (yyvsp[0].str)))
 			yyerror("out of memory");
 	}
-#line 4782 "util/configparser.c" /* yacc.c:1646  */
+#line 4900 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 393:
-#line 2130 "./util/configparser.y" /* yacc.c:1646  */
+  case 409:
+#line 2201 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(control_use_cert:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4791,122 +4909,122 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 4795 "util/configparser.c" /* yacc.c:1646  */
+#line 4913 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 394:
-#line 2140 "./util/configparser.y" /* yacc.c:1646  */
+  case 410:
+#line 2211 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rc_server_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_key_file);
 		cfg_parser->cfg->server_key_file = (yyvsp[0].str);
 	}
-#line 4805 "util/configparser.c" /* yacc.c:1646  */
+#line 4923 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 395:
-#line 2147 "./util/configparser.y" /* yacc.c:1646  */
+  case 411:
+#line 2218 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rc_server_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->server_cert_file);
 		cfg_parser->cfg->server_cert_file = (yyvsp[0].str);
 	}
-#line 4815 "util/configparser.c" /* yacc.c:1646  */
+#line 4933 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 396:
-#line 2154 "./util/configparser.y" /* yacc.c:1646  */
+  case 412:
+#line 2225 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rc_control_key_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_key_file);
 		cfg_parser->cfg->control_key_file = (yyvsp[0].str);
 	}
-#line 4825 "util/configparser.c" /* yacc.c:1646  */
+#line 4943 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 397:
-#line 2161 "./util/configparser.y" /* yacc.c:1646  */
+  case 413:
+#line 2232 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(rc_control_cert_file:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->control_cert_file);
 		cfg_parser->cfg->control_cert_file = (yyvsp[0].str);
 	}
-#line 4835 "util/configparser.c" /* yacc.c:1646  */
+#line 4953 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 398:
-#line 2168 "./util/configparser.y" /* yacc.c:1646  */
+  case 414:
+#line 2239 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("\nP(dnstap:)\n"));
 	}
-#line 4843 "util/configparser.c" /* yacc.c:1646  */
+#line 4961 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 413:
-#line 2185 "./util/configparser.y" /* yacc.c:1646  */
+  case 429:
+#line 2256 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->dnstap = (strcmp((yyvsp[0].str), "yes")==0);
 	}
-#line 4854 "util/configparser.c" /* yacc.c:1646  */
+#line 4972 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 414:
-#line 2193 "./util/configparser.y" /* yacc.c:1646  */
+  case 430:
+#line 2264 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_socket_path:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_socket_path);
 		cfg_parser->cfg->dnstap_socket_path = (yyvsp[0].str);
 	}
-#line 4864 "util/configparser.c" /* yacc.c:1646  */
+#line 4982 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 415:
-#line 2200 "./util/configparser.y" /* yacc.c:1646  */
+  case 431:
+#line 2271 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_send_identity:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->dnstap_send_identity = (strcmp((yyvsp[0].str), "yes")==0);
 	}
-#line 4875 "util/configparser.c" /* yacc.c:1646  */
+#line 4993 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 416:
-#line 2208 "./util/configparser.y" /* yacc.c:1646  */
+  case 432:
+#line 2279 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_send_version:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
 			yyerror("expected yes or no.");
 		else cfg_parser->cfg->dnstap_send_version = (strcmp((yyvsp[0].str), "yes")==0);
 	}
-#line 4886 "util/configparser.c" /* yacc.c:1646  */
+#line 5004 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 417:
-#line 2216 "./util/configparser.y" /* yacc.c:1646  */
+  case 433:
+#line 2287 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_identity);
 		cfg_parser->cfg->dnstap_identity = (yyvsp[0].str);
 	}
-#line 4896 "util/configparser.c" /* yacc.c:1646  */
+#line 5014 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 418:
-#line 2223 "./util/configparser.y" /* yacc.c:1646  */
+  case 434:
+#line 2294 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_version:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnstap_version);
 		cfg_parser->cfg->dnstap_version = (yyvsp[0].str);
 	}
-#line 4906 "util/configparser.c" /* yacc.c:1646  */
+#line 5024 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 419:
-#line 2230 "./util/configparser.y" /* yacc.c:1646  */
+  case 435:
+#line 2301 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4914,11 +5032,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_log_resolver_query_messages =
 			(strcmp((yyvsp[0].str), "yes")==0);
 	}
-#line 4918 "util/configparser.c" /* yacc.c:1646  */
+#line 5036 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 420:
-#line 2239 "./util/configparser.y" /* yacc.c:1646  */
+  case 436:
+#line 2310 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_resolver_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4926,11 +5044,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_log_resolver_response_messages =
 			(strcmp((yyvsp[0].str), "yes")==0);
 	}
-#line 4930 "util/configparser.c" /* yacc.c:1646  */
+#line 5048 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 421:
-#line 2248 "./util/configparser.y" /* yacc.c:1646  */
+  case 437:
+#line 2319 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_client_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4938,11 +5056,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_log_client_query_messages =
 			(strcmp((yyvsp[0].str), "yes")==0);
 	}
-#line 4942 "util/configparser.c" /* yacc.c:1646  */
+#line 5060 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 422:
-#line 2257 "./util/configparser.y" /* yacc.c:1646  */
+  case 438:
+#line 2328 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_client_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4950,11 +5068,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_log_client_response_messages =
 			(strcmp((yyvsp[0].str), "yes")==0);
 	}
-#line 4954 "util/configparser.c" /* yacc.c:1646  */
+#line 5072 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 423:
-#line 2266 "./util/configparser.y" /* yacc.c:1646  */
+  case 439:
+#line 2337 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_forwarder_query_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4962,11 +5080,11 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_log_forwarder_query_messages =
 			(strcmp((yyvsp[0].str), "yes")==0);
 	}
-#line 4966 "util/configparser.c" /* yacc.c:1646  */
+#line 5084 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 424:
-#line 2275 "./util/configparser.y" /* yacc.c:1646  */
+  case 440:
+#line 2346 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dt_dnstap_log_forwarder_response_messages:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -4974,29 +5092,29 @@ yyreduce:
 		else cfg_parser->cfg->dnstap_log_forwarder_response_messages =
 			(strcmp((yyvsp[0].str), "yes")==0);
 	}
-#line 4978 "util/configparser.c" /* yacc.c:1646  */
+#line 5096 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 425:
-#line 2284 "./util/configparser.y" /* yacc.c:1646  */
+  case 441:
+#line 2355 "./util/configparser.y" /* yacc.c:1646  */
     { 
 		OUTYY(("\nP(python:)\n")); 
 	}
-#line 4986 "util/configparser.c" /* yacc.c:1646  */
+#line 5104 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 429:
-#line 2293 "./util/configparser.y" /* yacc.c:1646  */
+  case 445:
+#line 2364 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(python-script:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->python_script);
 		cfg_parser->cfg->python_script = (yyvsp[0].str);
 	}
-#line 4996 "util/configparser.c" /* yacc.c:1646  */
+#line 5114 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 430:
-#line 2299 "./util/configparser.y" /* yacc.c:1646  */
+  case 446:
+#line 2370 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(disable_dnssec_lame_check:%s)\n", (yyvsp[0].str)));
 		if (strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5005,21 +5123,21 @@ yyreduce:
 			(strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5009 "util/configparser.c" /* yacc.c:1646  */
+#line 5127 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 431:
-#line 2309 "./util/configparser.y" /* yacc.c:1646  */
+  case 447:
+#line 2380 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_log_identity:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->log_identity);
 		cfg_parser->cfg->log_identity = (yyvsp[0].str);
 	}
-#line 5019 "util/configparser.c" /* yacc.c:1646  */
+#line 5137 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 432:
-#line 2316 "./util/configparser.y" /* yacc.c:1646  */
+  case 448:
+#line 2387 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_response_ip:%s %s)\n", (yyvsp[-1].str), (yyvsp[0].str)));
 		validate_respip_action((yyvsp[0].str));
@@ -5027,31 +5145,31 @@ yyreduce:
 			(yyvsp[-1].str), (yyvsp[0].str)))
 			fatal_exit("out of memory adding response-ip");
 	}
-#line 5031 "util/configparser.c" /* yacc.c:1646  */
+#line 5149 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 433:
-#line 2325 "./util/configparser.y" /* yacc.c:1646  */
+  case 449:
+#line 2396 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(server_response_ip_data:%s)\n", (yyvsp[-1].str)));
 			if(!cfg_str2list_insert(&cfg_parser->cfg->respip_data,
 				(yyvsp[-1].str), (yyvsp[0].str)))
 				fatal_exit("out of memory adding response-ip-data");
 	}
-#line 5042 "util/configparser.c" /* yacc.c:1646  */
+#line 5160 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 434:
-#line 2333 "./util/configparser.y" /* yacc.c:1646  */
+  case 450:
+#line 2404 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("\nP(dnscrypt:)\n"));
 		OUTYY(("\nP(dnscrypt:)\n"));
 	}
-#line 5051 "util/configparser.c" /* yacc.c:1646  */
+#line 5169 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 447:
-#line 2350 "./util/configparser.y" /* yacc.c:1646  */
+  case 463:
+#line 2421 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dnsc_dnscrypt_enable:%s)\n", (yyvsp[0].str)));
 		if(strcmp((yyvsp[0].str), "yes") != 0 && strcmp((yyvsp[0].str), "no") != 0)
@@ -5059,11 +5177,11 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt = (strcmp((yyvsp[0].str), "yes")==0);
 		free((yyvsp[0].str));
 	}
-#line 5063 "util/configparser.c" /* yacc.c:1646  */
+#line 5181 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 448:
-#line 2360 "./util/configparser.y" /* yacc.c:1646  */
+  case 464:
+#line 2431 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dnsc_dnscrypt_port:%s)\n", (yyvsp[0].str)));
 
@@ -5072,21 +5190,21 @@ yyreduce:
 		else cfg_parser->cfg->dnscrypt_port = atoi((yyvsp[0].str));
 		free((yyvsp[0].str));
 	}
-#line 5076 "util/configparser.c" /* yacc.c:1646  */
+#line 5194 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 449:
-#line 2370 "./util/configparser.y" /* yacc.c:1646  */
+  case 465:
+#line 2441 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dnsc_dnscrypt_provider:%s)\n", (yyvsp[0].str)));
 		free(cfg_parser->cfg->dnscrypt_provider);
 		cfg_parser->cfg->dnscrypt_provider = (yyvsp[0].str);
 	}
-#line 5086 "util/configparser.c" /* yacc.c:1646  */
+#line 5204 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 450:
-#line 2377 "./util/configparser.y" /* yacc.c:1646  */
+  case 466:
+#line 2448 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dnsc_dnscrypt_provider_cert:%s)\n", (yyvsp[0].str)));
 		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
@@ -5094,21 +5212,21 @@ yyreduce:
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-provider-cert");
 	}
-#line 5098 "util/configparser.c" /* yacc.c:1646  */
+#line 5216 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 451:
-#line 2386 "./util/configparser.y" /* yacc.c:1646  */
+  case 467:
+#line 2457 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dnsc_dnscrypt_provider_cert_rotated:%s)\n", (yyvsp[0].str)));
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_provider_cert_rotated, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-provider-cert-rotated");
 	}
-#line 5108 "util/configparser.c" /* yacc.c:1646  */
+#line 5226 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 452:
-#line 2393 "./util/configparser.y" /* yacc.c:1646  */
+  case 468:
+#line 2464 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("P(dnsc_dnscrypt_secret_key:%s)\n", (yyvsp[0].str)));
 		if(cfg_strlist_find(cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
@@ -5116,22 +5234,22 @@ yyreduce:
 		if(!cfg_strlist_insert(&cfg_parser->cfg->dnscrypt_secret_key, (yyvsp[0].str)))
 			fatal_exit("out of memory adding dnscrypt-secret-key");
 	}
-#line 5120 "util/configparser.c" /* yacc.c:1646  */
+#line 5238 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 453:
-#line 2402 "./util/configparser.y" /* yacc.c:1646  */
+  case 469:
+#line 2473 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(dnscrypt_shared_secret_cache_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_shared_secret_cache_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 5131 "util/configparser.c" /* yacc.c:1646  */
+#line 5249 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 454:
-#line 2410 "./util/configparser.y" /* yacc.c:1646  */
+  case 470:
+#line 2481 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -5143,22 +5261,22 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 5147 "util/configparser.c" /* yacc.c:1646  */
+#line 5265 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 455:
-#line 2423 "./util/configparser.y" /* yacc.c:1646  */
+  case 471:
+#line 2494 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(dnscrypt_nonce_cache_size:%s)\n", (yyvsp[0].str)));
   	if(!cfg_parse_memsize((yyvsp[0].str), &cfg_parser->cfg->dnscrypt_nonce_cache_size))
   		yyerror("memory size expected");
   	free((yyvsp[0].str));
   }
-#line 5158 "util/configparser.c" /* yacc.c:1646  */
+#line 5276 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 456:
-#line 2431 "./util/configparser.y" /* yacc.c:1646  */
+  case 472:
+#line 2502 "./util/configparser.y" /* yacc.c:1646  */
     {
   	OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", (yyvsp[0].str)));
   	if(atoi((yyvsp[0].str)) == 0)
@@ -5170,19 +5288,19 @@ yyreduce:
   	}
   	free((yyvsp[0].str));
   }
-#line 5174 "util/configparser.c" /* yacc.c:1646  */
+#line 5292 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 457:
-#line 2444 "./util/configparser.y" /* yacc.c:1646  */
+  case 473:
+#line 2515 "./util/configparser.y" /* yacc.c:1646  */
     {
 		OUTYY(("\nP(cachedb:)\n"));
 	}
-#line 5182 "util/configparser.c" /* yacc.c:1646  */
+#line 5300 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 462:
-#line 2453 "./util/configparser.y" /* yacc.c:1646  */
+  case 478:
+#line 2524 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(backend:%s)\n", (yyvsp[0].str)));
@@ -5195,11 +5313,11 @@ yyreduce:
 		OUTYY(("P(Compiled without cachedb, ignoring)\n"));
 	#endif
 	}
-#line 5199 "util/configparser.c" /* yacc.c:1646  */
+#line 5317 "util/configparser.c" /* yacc.c:1646  */
     break;
 
-  case 463:
-#line 2467 "./util/configparser.y" /* yacc.c:1646  */
+  case 479:
+#line 2538 "./util/configparser.y" /* yacc.c:1646  */
     {
 	#ifdef USE_CACHEDB
 		OUTYY(("P(secret-seed:%s)\n", (yyvsp[0].str)));
@@ -5213,11 +5331,11 @@ yyreduce:
 		free((yyvsp[0].str));
 	#endif
 	}
-#line 5217 "util/configparser.c" /* yacc.c:1646  */
+#line 5335 "util/configparser.c" /* yacc.c:1646  */
     break;
 
 
-#line 5221 "util/configparser.c" /* yacc.c:1646  */
+#line 5339 "util/configparser.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -5445,7 +5563,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 2481 "./util/configparser.y" /* yacc.c:1906  */
+#line 2552 "./util/configparser.y" /* yacc.c:1906  */
 
 
 /* parse helper routines could be here */
diff --git a/util/configparser.h b/util/configparser.h
index c715bb1a2..a80a7e65f 100644
--- a/util/configparser.h
+++ b/util/configparser.h
@@ -266,7 +266,13 @@ extern int yydebug;
     VAR_CACHEDB = 476,
     VAR_CACHEDB_BACKEND = 477,
     VAR_CACHEDB_SECRETSEED = 478,
-    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 479
+    VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM = 479,
+    VAR_FOR_UPSTREAM = 480,
+    VAR_AUTH_ZONE = 481,
+    VAR_ZONEFILE = 482,
+    VAR_MASTER = 483,
+    VAR_URL = 484,
+    VAR_FOR_DOWNSTREAM = 485
   };
 #endif
 /* Tokens.  */
@@ -492,6 +498,12 @@ extern int yydebug;
 #define VAR_CACHEDB_BACKEND 477
 #define VAR_CACHEDB_SECRETSEED 478
 #define VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM 479
+#define VAR_FOR_UPSTREAM 480
+#define VAR_AUTH_ZONE 481
+#define VAR_ZONEFILE 482
+#define VAR_MASTER 483
+#define VAR_URL 484
+#define VAR_FOR_DOWNSTREAM 485
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@ -502,7 +514,7 @@ union YYSTYPE
 
 	char*	str;
 
-#line 506 "util/configparser.h" /* yacc.c:1909  */
+#line 518 "util/configparser.h" /* yacc.c:1909  */
 };
 
 typedef union YYSTYPE YYSTYPE;
diff --git a/util/configparser.y b/util/configparser.y
index af4cda1a6..f00695994 100644
--- a/util/configparser.y
+++ b/util/configparser.y
@@ -152,16 +152,16 @@ extern struct config_parser_state* cfg_parser;
 %token VAR_IPSECMOD_ENABLED VAR_IPSECMOD_HOOK VAR_IPSECMOD_IGNORE_BOGUS
 %token VAR_IPSECMOD_MAX_TTL VAR_IPSECMOD_WHITELIST VAR_IPSECMOD_STRICT
 %token VAR_CACHEDB VAR_CACHEDB_BACKEND VAR_CACHEDB_SECRETSEED
-%token VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM
+%token VAR_UDP_UPSTREAM_WITHOUT_DOWNSTREAM VAR_FOR_UPSTREAM
+%token VAR_AUTH_ZONE VAR_ZONEFILE VAR_MASTER VAR_URL VAR_FOR_DOWNSTREAM
 
 %%
 toplevelvars: /* empty */ | toplevelvars toplevelvar ;
 toplevelvar: serverstart contents_server | stubstart contents_stub |
 	forwardstart contents_forward | pythonstart contents_py | 
-	rcstart contents_rc | dtstart contents_dt | viewstart 
-	contents_view |
-	dnscstart contents_dnsc |
-	cachedbstart contents_cachedb
+	rcstart contents_rc | dtstart contents_dt | viewstart contents_view |
+	dnscstart contents_dnsc | cachedbstart contents_cachedb |
+	authstart contents_auth
 	;
 
 /* server: declaration */
@@ -297,6 +297,26 @@ contents_view: contents_view content_view
 content_view: view_name | view_local_zone | view_local_data | view_first |
 		view_response_ip | view_response_ip_data | view_local_data_ptr
 	;
+authstart: VAR_AUTH_ZONE
+	{
+		struct config_auth* s;
+		OUTYY(("\nP(auth_zone:)\n")); 
+		s = (struct config_auth*)calloc(1, sizeof(struct config_auth));
+		if(s) {
+			s->next = cfg_parser->cfg->auths;
+			cfg_parser->cfg->auths = s;
+			/* defaults for auth zone */
+			s->for_downstream = 1;
+			s->for_upstream = 1;
+		} else 
+			yyerror("out of memory");
+	}
+	;
+contents_auth: contents_auth content_auth 
+	| ;
+content_auth: auth_name | auth_zonefile | auth_master | auth_url |
+	auth_for_downstream | auth_for_upstream
+	;
 server_num_threads: VAR_NUM_THREADS STRING_ARG 
 	{ 
 		OUTYY(("P(server_num_threads:%s)\n", $2)); 
@@ -1999,6 +2019,57 @@ forward_ssl_upstream: VAR_FORWARD_SSL_UPSTREAM STRING_ARG
 		free($2);
 	}
 	;
+auth_name: VAR_NAME STRING_ARG
+	{
+		OUTYY(("P(name:%s)\n", $2));
+		if(cfg_parser->cfg->auths->name)
+			yyerror("auth name override, there must be one name "
+				"for one auth-zone");
+		free(cfg_parser->cfg->auths->name);
+		cfg_parser->cfg->auths->name = $2;
+	}
+	;
+auth_zonefile: VAR_ZONEFILE STRING_ARG
+	{
+		OUTYY(("P(zonefile:%s)\n", $2));
+		free(cfg_parser->cfg->auths->zonefile);
+		cfg_parser->cfg->auths->zonefile = $2;
+	}
+	;
+auth_master: VAR_MASTER STRING_ARG
+	{
+		OUTYY(("P(master:%s)\n", $2));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->masters, $2))
+			yyerror("out of memory");
+	}
+	;
+auth_url: VAR_URL STRING_ARG
+	{
+		OUTYY(("P(url:%s)\n", $2));
+		if(!cfg_strlist_insert(&cfg_parser->cfg->auths->urls, $2))
+			yyerror("out of memory");
+	}
+	;
+auth_for_downstream: VAR_FOR_DOWNSTREAM STRING_ARG
+	{
+		OUTYY(("P(for-downstream:%s)\n", $2));
+		if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->auths->for_downstream =
+			(strcmp($2, "yes")==0);
+		free($2);
+	}
+	;
+auth_for_upstream: VAR_FOR_UPSTREAM STRING_ARG
+	{
+		OUTYY(("P(for-upstream:%s)\n", $2));
+		if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->auths->for_upstream =
+			(strcmp($2, "yes")==0);
+		free($2);
+	}
+	;
 view_name: VAR_NAME STRING_ARG
 	{
 		OUTYY(("P(name:%s)\n", $2));
diff --git a/util/fptr_wlist.c b/util/fptr_wlist.c
index d3c1a0c06..35268a36e 100644
--- a/util/fptr_wlist.c
+++ b/util/fptr_wlist.c
@@ -215,6 +215,7 @@ fptr_whitelist_rbtree_cmp(int (*fptr) (const void *, const void *))
 	else if(fptr == &view_cmp) return 1;
 	else if(fptr == &auth_zone_cmp) return 1;
 	else if(fptr == &auth_data_cmp) return 1;
+	else if(fptr == &auth_xfer_cmp) return 1;
 	return 0;
 }