From: quasar <quasar@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 26 Oct 2007 16:45:56 +0000 (+0000)
Subject: * Cleanup the DTD by renaming:
X-Git-Tag: v3.3~925
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/504b4d20dd2db9ea1eaa9c4b390b2a412d7c9779

* Cleanup the DTD by renaming:
   <cpu> to <host>
   <network_link> to <link>
   <route_element> to <link:ctn>
   "name" attributes to "id"
* Modify the DTD to add properties to <process>, <host> and <link>
  In the DTD, these are <prop name=... value=...> subtags, and this
  can be retrieved as a xbt_dict from the source code (see below)
* Add the following functions to the user API to retrieve (as
  xbt_dict) the  properties defined in XML:
    xbt_dict_t SD_link_get_properties(SD_link_t link);
    const char* SD_link_get_property_value(SD_link_t l,char* name);
   and, on the same model,
    SD_workstation_get_{properties,property_value}()
    MSG_process_get_{properties,property_value}()
    MSG_host_get_{properties,property_value}()
    gras_process_get_{properties,property_value}()
    gras_os_host_get_{properties,property_value}()
* Modify the parser to work in one pass only.
  Some more work may be done so that surf does the parsing after the
  models have declared the callbacks.
* Enforce the order in the DTD: routes must come after the last CPU,
  router and link


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4876 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/include/gras/process.h b/include/gras/process.h
index 0f8f0f1f02..335a9c11d2 100644
--- a/include/gras/process.h
+++ b/include/gras/process.h
@@ -11,10 +11,11 @@
 #define GRAS_PROCESS_H
 
 #include "xbt/misc.h"  /* SG_BEGIN_DECL */
+#include "xbt/dict.h"
 
 SG_BEGIN_DECL()
 
-void gras_agent_spawn(const char *name, void *data, xbt_main_func_t code, int argc, char *argv[]);
+void gras_agent_spawn(const char *name, void *data, xbt_main_func_t code, int argc, char *argv[], xbt_dict_t properties);
   
   
 /****************************************************************************/
diff --git a/include/gras/virtu.h b/include/gras/virtu.h
index 0eb93f9ada..8669ebfc98 100644
--- a/include/gras/virtu.h
+++ b/include/gras/virtu.h
@@ -67,6 +67,15 @@ gras_os_hostport(void);
  */
 XBT_PUBLIC(int) gras_os_getpid(void);
 
+
+/* The following functions handle process property query */
+XBT_PUBLIC(xbt_dict_t) gras_process_properties(void);
+XBT_PUBLIC(const char*) gras_process_property_value(char* name);
+
+/* The following functions handle host/cpu property query */
+XBT_PUBLIC(xbt_dict_t) gras_os_host_properties(void);
+XBT_PUBLIC(const char*) gras_os_property_value(char* name);   
+
 /** @} */
 SG_END_DECL()
 
diff --git a/include/msg/msg.h b/include/msg/msg.h
index 16f4e12311..744dcdd0b0 100644
--- a/include/msg/msg.h
+++ b/include/msg/msg.h
@@ -39,6 +39,10 @@ XBT_PUBLIC(int) MSG_get_host_msgload(m_host_t host);
 XBT_PUBLIC(double) MSG_get_host_speed(m_host_t h);
 XBT_PUBLIC(int) MSG_host_is_avail (m_host_t h);
 
+/*property handlers*/
+XBT_PUBLIC(xbt_dict_t) MSG_host_get_properties(m_host_t host);
+XBT_PUBLIC(const char*) MSG_host_get_property_value(m_host_t host, char* name);
+
 XBT_PUBLIC(void) MSG_create_environment(const char *file);
 
 XBT_PUBLIC(m_host_t) MSG_get_host_by_name(const char *name);
@@ -52,6 +56,9 @@ XBT_PUBLIC(m_process_t) MSG_process_create(const char *name,
 XBT_PUBLIC(m_process_t) MSG_process_create_with_arguments(const char *name,
 					      xbt_main_func_t code, void *data,
 					      m_host_t host, int argc, char **argv);
+XBT_PUBLIC(m_process_t) MSG_process_create_with_environment(const char *name,
+					      xbt_main_func_t code, void *data,
+					      m_host_t host, int argc, char **argv, xbt_dict_t properties);
 XBT_PUBLIC(void) MSG_process_kill(m_process_t process);
 XBT_PUBLIC(int) MSG_process_killall(int reset_PIDs);
 
@@ -68,6 +75,10 @@ XBT_PUBLIC(int) MSG_process_self_PID(void);
 XBT_PUBLIC(int) MSG_process_self_PPID(void);
 XBT_PUBLIC(m_process_t) MSG_process_self(void);
 
+/*property handlers*/
+XBT_PUBLIC(xbt_dict_t) MSG_process_get_properties(m_process_t process);
+XBT_PUBLIC(const char*) MSG_process_get_property_value(m_process_t process, char* name);
+
 XBT_PUBLIC(MSG_error_t) MSG_process_suspend(m_process_t process);
 XBT_PUBLIC(MSG_error_t) MSG_process_resume(m_process_t process);
 XBT_PUBLIC(int) MSG_process_is_suspended(m_process_t process);
diff --git a/include/simdag/simdag.h b/include/simdag/simdag.h
index 301e4b652c..8ca92a3770 100644
--- a/include/simdag/simdag.h
+++ b/include/simdag/simdag.h
@@ -3,6 +3,9 @@
 
 #include "simdag/datatypes.h"
 #include "xbt/misc.h"
+#include "xbt/dynar.h"
+#include "xbt/dict.h"
+
 
 SG_BEGIN_DECL()
 
@@ -27,6 +30,9 @@ XBT_PUBLIC(void)               SD_link_set_data(SD_link_t link, void *data);
 XBT_PUBLIC(const char*)        SD_link_get_name(SD_link_t link);
 XBT_PUBLIC(double)             SD_link_get_current_bandwidth(SD_link_t link);
 XBT_PUBLIC(double)             SD_link_get_current_latency(SD_link_t link);
+/*property handling functions*/
+XBT_PUBLIC(xbt_dict_t) SD_link_get_properties(SD_link_t link);
+XBT_PUBLIC(const char*) SD_link_get_property_value(SD_link_t link, char* name);
 /** @} */
 
 /************************** Workstation handling ****************************/
@@ -51,6 +57,10 @@ XBT_PUBLIC(int)                     SD_workstation_get_number(void);
 XBT_PUBLIC(void)                    SD_workstation_set_data(SD_workstation_t workstation, void *data);
 XBT_PUBLIC(void*)                   SD_workstation_get_data(SD_workstation_t workstation);
 XBT_PUBLIC(const char*)             SD_workstation_get_name(SD_workstation_t workstation);
+/*property handling functions*/
+XBT_PUBLIC(xbt_dict_t) SD_workstation_get_properties(SD_workstation_t workstation);
+XBT_PUBLIC(const char*) SD_workstation_get_property_value(SD_workstation_t workstation, char* name);
+ 
 XBT_PUBLIC(const SD_link_t*)              SD_route_get_list(SD_workstation_t src, SD_workstation_t dst);
 XBT_PUBLIC(int)                     SD_route_get_size(SD_workstation_t src, SD_workstation_t dst);
 XBT_PUBLIC(double)                  SD_workstation_get_power(SD_workstation_t workstation);
diff --git a/include/surf/surfxml.h b/include/surf/surfxml.h
index d6aaf7d204..b2c3727018 100644
--- a/include/surf/surfxml.h
+++ b/include/surf/surfxml.h
@@ -1,10 +1,10 @@
 /* XML processor/application API for surf/surfxml.dtd.
- * Generated 2007/10/12 10:23:14.
+ * Generated 2007/10/23 11:08:07.
  *
  * This program was generated with the FleXML XML processor generator.
  * FleXML is Copyright (C) 1999-2005 Kristoffer Rose.  All rights reserved.
  * FleXML is Copyright (C) 2003-2006 Martin Quinson.  All rights reserved.
- * (Id: flexml.pl,v 1.62 2007/10/11 10:00:14 mquinson Exp).
+ * (Id: flexml.pl,v 1.61 2006/09/13 16:34:33 wdowling Exp).
  * 
  * There are two, intertwined parts to this program, part A and part B.
  *
@@ -53,156 +53,166 @@ XBT_PUBLIC(void ) STag_surfxml_platform_description(void);
 XBT_PUBLIC(void ) ETag_surfxml_platform_description(void);
 XBT_PUBLIC(void ) STag_surfxml_include(void);
 XBT_PUBLIC(void ) ETag_surfxml_include(void);
-XBT_PUBLIC(void ) STag_surfxml_cpu(void);
-XBT_PUBLIC(void ) ETag_surfxml_cpu(void);
+XBT_PUBLIC(void ) STag_surfxml_host(void);
+XBT_PUBLIC(void ) ETag_surfxml_host(void);
+XBT_PUBLIC(void ) STag_surfxml_prop(void);
+XBT_PUBLIC(void ) ETag_surfxml_prop(void);
 XBT_PUBLIC(void ) STag_surfxml_router(void);
 XBT_PUBLIC(void ) ETag_surfxml_router(void);
-XBT_PUBLIC(void ) STag_surfxml_network_link(void);
-XBT_PUBLIC(void ) ETag_surfxml_network_link(void);
+XBT_PUBLIC(void ) STag_surfxml_link(void);
+XBT_PUBLIC(void ) ETag_surfxml_link(void);
 XBT_PUBLIC(void ) STag_surfxml_route(void);
 XBT_PUBLIC(void ) ETag_surfxml_route(void);
-XBT_PUBLIC(void ) STag_surfxml_route_element(void);
-XBT_PUBLIC(void ) ETag_surfxml_route_element(void);
+XBT_PUBLIC(void ) STag_surfxml_link_c_ctn(void);
+XBT_PUBLIC(void ) ETag_surfxml_link_c_ctn(void);
 XBT_PUBLIC(void ) STag_surfxml_process(void);
 XBT_PUBLIC(void ) ETag_surfxml_process(void);
 XBT_PUBLIC(void ) STag_surfxml_argument(void);
 XBT_PUBLIC(void ) ETag_surfxml_argument(void);
 
 /* XML application data. */
-typedef int AT_surfxml_network_link_bandwidth;
-#define AU_surfxml_network_link_bandwidth NULL
-typedef int AT_surfxml_router_name;
-#define AU_surfxml_router_name NULL
+typedef int AT_surfxml_link_id;
+#define AU_surfxml_link_id NULL
+typedef int AT_surfxml_prop_id;
+#define AU_surfxml_prop_id NULL
+typedef int AT_surfxml_host_interference_recv;
+#define AU_surfxml_host_interference_recv NULL
+typedef int AT_surfxml_host_id;
+#define AU_surfxml_host_id NULL
+typedef int AT_surfxml_link_latency_file;
+#define AU_surfxml_link_latency_file NULL
 typedef int AT_surfxml_process_host;
 #define AU_surfxml_process_host NULL
-typedef int AT_surfxml_network_link_latency_file;
-#define AU_surfxml_network_link_latency_file NULL
+typedef int AT_surfxml_host_availability_file;
+#define AU_surfxml_host_availability_file NULL
+typedef enum { AU_surfxml_host_state, A_surfxml_host_state_ON,A_surfxml_host_state_OFF } AT_surfxml_host_state;
+typedef int AT_surfxml_host_interference_send_recv;
+#define AU_surfxml_host_interference_send_recv NULL
 typedef int AT_surfxml_route_impact_on_dst_with_other_send;
 #define AU_surfxml_route_impact_on_dst_with_other_send NULL
-typedef int AT_surfxml_cpu_interference_send_recv;
-#define AU_surfxml_cpu_interference_send_recv NULL
+typedef int AT_surfxml_host_interference_send;
+#define AU_surfxml_host_interference_send NULL
 typedef int AT_surfxml_route_impact_on_dst;
 #define AU_surfxml_route_impact_on_dst NULL
 typedef int AT_surfxml_platform_description_version;
 #define AU_surfxml_platform_description_version NULL
+typedef int AT_surfxml_prop_value;
+#define AU_surfxml_prop_value NULL
 typedef int AT_surfxml_route_impact_on_src_with_other_recv;
 #define AU_surfxml_route_impact_on_src_with_other_recv NULL
-typedef int AT_surfxml_route_element_name;
-#define AU_surfxml_route_element_name NULL
+typedef int AT_surfxml_host_power;
+#define AU_surfxml_host_power NULL
+typedef int AT_surfxml_link_state_file;
+#define AU_surfxml_link_state_file NULL
+typedef int AT_surfxml_router_id;
+#define AU_surfxml_router_id NULL
 typedef int AT_surfxml_process_start_time;
 #define AU_surfxml_process_start_time NULL
 typedef int AT_surfxml_process_function;
 #define AU_surfxml_process_function NULL
-typedef enum { AU_surfxml_cpu_state, A_surfxml_cpu_state_ON,A_surfxml_cpu_state_OFF } AT_surfxml_cpu_state;
-typedef int AT_surfxml_cpu_interference_send;
-#define AU_surfxml_cpu_interference_send NULL
-typedef int AT_surfxml_network_link_bandwidth_file;
-#define AU_surfxml_network_link_bandwidth_file NULL
-typedef int AT_surfxml_cpu_name;
-#define AU_surfxml_cpu_name NULL
+typedef int AT_surfxml_host_max_outgoing_rate;
+#define AU_surfxml_host_max_outgoing_rate NULL
+typedef enum { AU_surfxml_link_sharing_policy, A_surfxml_link_sharing_policy_SHARED,A_surfxml_link_sharing_policy_FATPIPE } AT_surfxml_link_sharing_policy;
+typedef int AT_surfxml_link_c_ctn_id;
+#define AU_surfxml_link_c_ctn_id NULL
 typedef int AT_surfxml_process_kill_time;
 #define AU_surfxml_process_kill_time NULL
-typedef enum { AU_surfxml_network_link_state, A_surfxml_network_link_state_ON,A_surfxml_network_link_state_OFF } AT_surfxml_network_link_state;
-typedef int AT_surfxml_cpu_availability_file;
-#define AU_surfxml_cpu_availability_file NULL
+typedef int AT_surfxml_host_availability;
+#define AU_surfxml_host_availability NULL
 typedef int AT_surfxml_argument_value;
 #define AU_surfxml_argument_value NULL
+typedef enum { AU_surfxml_link_state, A_surfxml_link_state_ON,A_surfxml_link_state_OFF } AT_surfxml_link_state;
 typedef int AT_surfxml_route_src;
 #define AU_surfxml_route_src NULL
 typedef int AT_surfxml_route_impact_on_src;
 #define AU_surfxml_route_impact_on_src NULL
-typedef int AT_surfxml_cpu_max_outgoing_rate;
-#define AU_surfxml_cpu_max_outgoing_rate NULL
-typedef int AT_surfxml_cpu_availability;
-#define AU_surfxml_cpu_availability NULL
-typedef int AT_surfxml_cpu_interference_recv;
-#define AU_surfxml_cpu_interference_recv NULL
-typedef int AT_surfxml_network_link_name;
-#define AU_surfxml_network_link_name NULL
-typedef int AT_surfxml_cpu_power;
-#define AU_surfxml_cpu_power NULL
+typedef int AT_surfxml_link_bandwidth;
+#define AU_surfxml_link_bandwidth NULL
+typedef int AT_surfxml_link_latency;
+#define AU_surfxml_link_latency NULL
 typedef int AT_surfxml_include_file;
 #define AU_surfxml_include_file NULL
-typedef enum { AU_surfxml_network_link_sharing_policy, A_surfxml_network_link_sharing_policy_SHARED,A_surfxml_network_link_sharing_policy_FATPIPE } AT_surfxml_network_link_sharing_policy;
+typedef int AT_surfxml_link_bandwidth_file;
+#define AU_surfxml_link_bandwidth_file NULL
+typedef int AT_surfxml_host_state_file;
+#define AU_surfxml_host_state_file NULL
 typedef int AT_surfxml_route_dst;
 #define AU_surfxml_route_dst NULL
-typedef int AT_surfxml_network_link_latency;
-#define AU_surfxml_network_link_latency NULL
-typedef int AT_surfxml_cpu_state_file;
-#define AU_surfxml_cpu_state_file NULL
-typedef int AT_surfxml_network_link_state_file;
-#define AU_surfxml_network_link_state_file NULL
 
 /* FleXML-provided data. */
 XBT_PUBLIC_DATA(int ) surfxml_pcdata_ix;
 XBT_PUBLIC_DATA(char *) surfxml_bufferstack;
 #define surfxml_pcdata (surfxml_bufferstack + surfxml_pcdata_ix)
-XBT_PUBLIC_DATA(AT_surfxml_network_link_bandwidth ) AX_surfxml_network_link_bandwidth;
-#define A_surfxml_network_link_bandwidth (surfxml_bufferstack + AX_surfxml_network_link_bandwidth)
-XBT_PUBLIC_DATA(AT_surfxml_router_name ) AX_surfxml_router_name;
-#define A_surfxml_router_name (surfxml_bufferstack + AX_surfxml_router_name)
+XBT_PUBLIC_DATA(AT_surfxml_link_id ) AX_surfxml_link_id;
+#define A_surfxml_link_id (surfxml_bufferstack + AX_surfxml_link_id)
+XBT_PUBLIC_DATA(AT_surfxml_prop_id ) AX_surfxml_prop_id;
+#define A_surfxml_prop_id (surfxml_bufferstack + AX_surfxml_prop_id)
+XBT_PUBLIC_DATA(AT_surfxml_host_interference_recv ) AX_surfxml_host_interference_recv;
+#define A_surfxml_host_interference_recv (surfxml_bufferstack + AX_surfxml_host_interference_recv)
+XBT_PUBLIC_DATA(AT_surfxml_host_id ) AX_surfxml_host_id;
+#define A_surfxml_host_id (surfxml_bufferstack + AX_surfxml_host_id)
+XBT_PUBLIC_DATA(AT_surfxml_link_latency_file ) AX_surfxml_link_latency_file;
+#define A_surfxml_link_latency_file (surfxml_bufferstack + AX_surfxml_link_latency_file)
 XBT_PUBLIC_DATA(AT_surfxml_process_host ) AX_surfxml_process_host;
 #define A_surfxml_process_host (surfxml_bufferstack + AX_surfxml_process_host)
-XBT_PUBLIC_DATA(AT_surfxml_network_link_latency_file ) AX_surfxml_network_link_latency_file;
-#define A_surfxml_network_link_latency_file (surfxml_bufferstack + AX_surfxml_network_link_latency_file)
+XBT_PUBLIC_DATA(AT_surfxml_host_availability_file ) AX_surfxml_host_availability_file;
+#define A_surfxml_host_availability_file (surfxml_bufferstack + AX_surfxml_host_availability_file)
+XBT_PUBLIC_DATA(AT_surfxml_host_state ) AX_surfxml_host_state;
+#define A_surfxml_host_state AX_surfxml_host_state
+XBT_PUBLIC_DATA(AT_surfxml_host_interference_send_recv ) AX_surfxml_host_interference_send_recv;
+#define A_surfxml_host_interference_send_recv (surfxml_bufferstack + AX_surfxml_host_interference_send_recv)
 XBT_PUBLIC_DATA(AT_surfxml_route_impact_on_dst_with_other_send ) AX_surfxml_route_impact_on_dst_with_other_send;
 #define A_surfxml_route_impact_on_dst_with_other_send (surfxml_bufferstack + AX_surfxml_route_impact_on_dst_with_other_send)
-XBT_PUBLIC_DATA(AT_surfxml_cpu_interference_send_recv ) AX_surfxml_cpu_interference_send_recv;
-#define A_surfxml_cpu_interference_send_recv (surfxml_bufferstack + AX_surfxml_cpu_interference_send_recv)
+XBT_PUBLIC_DATA(AT_surfxml_host_interference_send ) AX_surfxml_host_interference_send;
+#define A_surfxml_host_interference_send (surfxml_bufferstack + AX_surfxml_host_interference_send)
 XBT_PUBLIC_DATA(AT_surfxml_route_impact_on_dst ) AX_surfxml_route_impact_on_dst;
 #define A_surfxml_route_impact_on_dst (surfxml_bufferstack + AX_surfxml_route_impact_on_dst)
 XBT_PUBLIC_DATA(AT_surfxml_platform_description_version ) AX_surfxml_platform_description_version;
 #define A_surfxml_platform_description_version (surfxml_bufferstack + AX_surfxml_platform_description_version)
+XBT_PUBLIC_DATA(AT_surfxml_prop_value ) AX_surfxml_prop_value;
+#define A_surfxml_prop_value (surfxml_bufferstack + AX_surfxml_prop_value)
 XBT_PUBLIC_DATA(AT_surfxml_route_impact_on_src_with_other_recv ) AX_surfxml_route_impact_on_src_with_other_recv;
 #define A_surfxml_route_impact_on_src_with_other_recv (surfxml_bufferstack + AX_surfxml_route_impact_on_src_with_other_recv)
-XBT_PUBLIC_DATA(AT_surfxml_route_element_name ) AX_surfxml_route_element_name;
-#define A_surfxml_route_element_name (surfxml_bufferstack + AX_surfxml_route_element_name)
+XBT_PUBLIC_DATA(AT_surfxml_host_power ) AX_surfxml_host_power;
+#define A_surfxml_host_power (surfxml_bufferstack + AX_surfxml_host_power)
+XBT_PUBLIC_DATA(AT_surfxml_link_state_file ) AX_surfxml_link_state_file;
+#define A_surfxml_link_state_file (surfxml_bufferstack + AX_surfxml_link_state_file)
+XBT_PUBLIC_DATA(AT_surfxml_router_id ) AX_surfxml_router_id;
+#define A_surfxml_router_id (surfxml_bufferstack + AX_surfxml_router_id)
 XBT_PUBLIC_DATA(AT_surfxml_process_start_time ) AX_surfxml_process_start_time;
 #define A_surfxml_process_start_time (surfxml_bufferstack + AX_surfxml_process_start_time)
 XBT_PUBLIC_DATA(AT_surfxml_process_function ) AX_surfxml_process_function;
 #define A_surfxml_process_function (surfxml_bufferstack + AX_surfxml_process_function)
-XBT_PUBLIC_DATA(AT_surfxml_cpu_state ) AX_surfxml_cpu_state;
-#define A_surfxml_cpu_state AX_surfxml_cpu_state
-XBT_PUBLIC_DATA(AT_surfxml_cpu_interference_send ) AX_surfxml_cpu_interference_send;
-#define A_surfxml_cpu_interference_send (surfxml_bufferstack + AX_surfxml_cpu_interference_send)
-XBT_PUBLIC_DATA(AT_surfxml_network_link_bandwidth_file ) AX_surfxml_network_link_bandwidth_file;
-#define A_surfxml_network_link_bandwidth_file (surfxml_bufferstack + AX_surfxml_network_link_bandwidth_file)
-XBT_PUBLIC_DATA(AT_surfxml_cpu_name ) AX_surfxml_cpu_name;
-#define A_surfxml_cpu_name (surfxml_bufferstack + AX_surfxml_cpu_name)
+XBT_PUBLIC_DATA(AT_surfxml_host_max_outgoing_rate ) AX_surfxml_host_max_outgoing_rate;
+#define A_surfxml_host_max_outgoing_rate (surfxml_bufferstack + AX_surfxml_host_max_outgoing_rate)
+XBT_PUBLIC_DATA(AT_surfxml_link_sharing_policy ) AX_surfxml_link_sharing_policy;
+#define A_surfxml_link_sharing_policy AX_surfxml_link_sharing_policy
+XBT_PUBLIC_DATA(AT_surfxml_link_c_ctn_id ) AX_surfxml_link_c_ctn_id;
+#define A_surfxml_link_c_ctn_id (surfxml_bufferstack + AX_surfxml_link_c_ctn_id)
 XBT_PUBLIC_DATA(AT_surfxml_process_kill_time ) AX_surfxml_process_kill_time;
 #define A_surfxml_process_kill_time (surfxml_bufferstack + AX_surfxml_process_kill_time)
-XBT_PUBLIC_DATA(AT_surfxml_network_link_state ) AX_surfxml_network_link_state;
-#define A_surfxml_network_link_state AX_surfxml_network_link_state
-XBT_PUBLIC_DATA(AT_surfxml_cpu_availability_file ) AX_surfxml_cpu_availability_file;
-#define A_surfxml_cpu_availability_file (surfxml_bufferstack + AX_surfxml_cpu_availability_file)
+XBT_PUBLIC_DATA(AT_surfxml_host_availability ) AX_surfxml_host_availability;
+#define A_surfxml_host_availability (surfxml_bufferstack + AX_surfxml_host_availability)
 XBT_PUBLIC_DATA(AT_surfxml_argument_value ) AX_surfxml_argument_value;
 #define A_surfxml_argument_value (surfxml_bufferstack + AX_surfxml_argument_value)
+XBT_PUBLIC_DATA(AT_surfxml_link_state ) AX_surfxml_link_state;
+#define A_surfxml_link_state AX_surfxml_link_state
 XBT_PUBLIC_DATA(AT_surfxml_route_src ) AX_surfxml_route_src;
 #define A_surfxml_route_src (surfxml_bufferstack + AX_surfxml_route_src)
 XBT_PUBLIC_DATA(AT_surfxml_route_impact_on_src ) AX_surfxml_route_impact_on_src;
 #define A_surfxml_route_impact_on_src (surfxml_bufferstack + AX_surfxml_route_impact_on_src)
-XBT_PUBLIC_DATA(AT_surfxml_cpu_max_outgoing_rate ) AX_surfxml_cpu_max_outgoing_rate;
-#define A_surfxml_cpu_max_outgoing_rate (surfxml_bufferstack + AX_surfxml_cpu_max_outgoing_rate)
-XBT_PUBLIC_DATA(AT_surfxml_cpu_availability ) AX_surfxml_cpu_availability;
-#define A_surfxml_cpu_availability (surfxml_bufferstack + AX_surfxml_cpu_availability)
-XBT_PUBLIC_DATA(AT_surfxml_cpu_interference_recv ) AX_surfxml_cpu_interference_recv;
-#define A_surfxml_cpu_interference_recv (surfxml_bufferstack + AX_surfxml_cpu_interference_recv)
-XBT_PUBLIC_DATA(AT_surfxml_network_link_name ) AX_surfxml_network_link_name;
-#define A_surfxml_network_link_name (surfxml_bufferstack + AX_surfxml_network_link_name)
-XBT_PUBLIC_DATA(AT_surfxml_cpu_power ) AX_surfxml_cpu_power;
-#define A_surfxml_cpu_power (surfxml_bufferstack + AX_surfxml_cpu_power)
+XBT_PUBLIC_DATA(AT_surfxml_link_bandwidth ) AX_surfxml_link_bandwidth;
+#define A_surfxml_link_bandwidth (surfxml_bufferstack + AX_surfxml_link_bandwidth)
+XBT_PUBLIC_DATA(AT_surfxml_link_latency ) AX_surfxml_link_latency;
+#define A_surfxml_link_latency (surfxml_bufferstack + AX_surfxml_link_latency)
 XBT_PUBLIC_DATA(AT_surfxml_include_file ) AX_surfxml_include_file;
 #define A_surfxml_include_file (surfxml_bufferstack + AX_surfxml_include_file)
-XBT_PUBLIC_DATA(AT_surfxml_network_link_sharing_policy ) AX_surfxml_network_link_sharing_policy;
-#define A_surfxml_network_link_sharing_policy AX_surfxml_network_link_sharing_policy
+XBT_PUBLIC_DATA(AT_surfxml_link_bandwidth_file ) AX_surfxml_link_bandwidth_file;
+#define A_surfxml_link_bandwidth_file (surfxml_bufferstack + AX_surfxml_link_bandwidth_file)
+XBT_PUBLIC_DATA(AT_surfxml_host_state_file ) AX_surfxml_host_state_file;
+#define A_surfxml_host_state_file (surfxml_bufferstack + AX_surfxml_host_state_file)
 XBT_PUBLIC_DATA(AT_surfxml_route_dst ) AX_surfxml_route_dst;
 #define A_surfxml_route_dst (surfxml_bufferstack + AX_surfxml_route_dst)
-XBT_PUBLIC_DATA(AT_surfxml_network_link_latency ) AX_surfxml_network_link_latency;
-#define A_surfxml_network_link_latency (surfxml_bufferstack + AX_surfxml_network_link_latency)
-XBT_PUBLIC_DATA(AT_surfxml_cpu_state_file ) AX_surfxml_cpu_state_file;
-#define A_surfxml_cpu_state_file (surfxml_bufferstack + AX_surfxml_cpu_state_file)
-XBT_PUBLIC_DATA(AT_surfxml_network_link_state_file ) AX_surfxml_network_link_state_file;
-#define A_surfxml_network_link_state_file (surfxml_bufferstack + AX_surfxml_network_link_state_file)
 
 /* XML application utilities. */
 XBT_PUBLIC(int ) surfxml_element_context(int);
diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h
index a219d2fed0..0d69e6ae1c 100644
--- a/include/surf/surfxml_parse.h
+++ b/include/surf/surfxml_parse.h
@@ -11,12 +11,14 @@
 #include <stdio.h> /* to have FILE */
 #include "surf/surfxml.h"
 #include "xbt/function_types.h"
+#include "xbt/dict.h"
+
 /* Entry-point of the surfxml parser. */
 XBT_PUBLIC_DATA(int_f_void_t) surf_parse;
 
 /* Hook for the different tags. They can be redefined at will whereas
    the versions without the _fun can't. */
-
+/*
 XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_platform_description_fun;
 XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_platform_description_fun;
 XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_cpu_fun;
@@ -33,6 +35,9 @@ XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_process_fun;
 XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_process_fun;
 XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_argument_fun;
 XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_argument_fun;
+XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_prop_fun;
+XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_prop_fun;
+*/
 
 XBT_PUBLIC(void) surf_parse_open(const char *file);
 XBT_PUBLIC(void) surf_parse_close(void);
diff --git a/src/gras/Virtu/rl_process.c b/src/gras/Virtu/rl_process.c
index 7ae8b786b2..7629a1a829 100644
--- a/src/gras/Virtu/rl_process.c
+++ b/src/gras/Virtu/rl_process.c
@@ -48,6 +48,6 @@ gras_procdata_t *gras_procdata_get(void) {
 }
 
 void gras_agent_spawn(const char *name, void *data, 
-		      xbt_main_func_t code, int argc, char *argv[]) {
+		      xbt_main_func_t code, int argc, char *argv[], xbt_dict_t properties) {
    THROW_UNIMPLEMENTED;
 }
diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c
index 3526d40971..416c9d5a50 100644
--- a/src/gras/Virtu/sg_process.c
+++ b/src/gras/Virtu/sg_process.c
@@ -8,6 +8,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/ex.h"
+#include "xbt/dict.h"
 #include "gras_modinter.h" /* module initialization interface */
 #include "gras/Virtu/virtu_sg.h"
 #include "gras/Msg/msg_interface.h" /* For some checks at simulation end */
@@ -19,12 +20,12 @@ static long int PID = 1;
 
 
 void gras_agent_spawn(const char *name, void *data, 
-		      xbt_main_func_t code, int argc, char *argv[]) {
+		      xbt_main_func_t code, int argc, char *argv[], xbt_dict_t properties) {
    
    SIMIX_process_create(name, code,
 			data,
 			gras_os_myname(), 
-			argc, argv);
+			argc, argv, properties);
 }
 
 /* **************************************************************************
@@ -136,6 +137,26 @@ gras_libdata_by_name_from_remote(const char *name, smx_process_t p) {
   return gras_libdata_by_name_from_procdata(name, pd);
 }   
 
+/**
+ * \brief Returns the value of a property for the current gras process
+ *
+ * \return the value of the property
+ */
+const char* gras_process_property_value(char* name)
+{
+ return xbt_dict_get_or_null(SIMIX_process_get_properties(SIMIX_process_self()), name);
+}
+
+/**
+ * \brief Returns the dictionary of properties for the current gras process
+ *
+ * \return the dictionary
+ */
+xbt_dict_t gras_process_properties(void)
+{
+  return SIMIX_process_get_properties(SIMIX_process_self());
+}
+
 /* **************************************************************************
  * OS virtualization function
  * **************************************************************************/
@@ -161,6 +182,26 @@ int gras_os_getpid(void) {
     return 0;
 }
 
+/**
+ * \brief Returns the value of a property for the current gras os
+ *
+ * \return the value of the property
+ */
+const char* gras_os_property_value(char* name)
+{
+ return xbt_dict_get_or_null(SIMIX_host_get_properties(SIMIX_process_get_host(SIMIX_process_self())), name);
+}
+
+/**
+ * \brief Returns the dictionary of properties for the gras host
+ *
+ * \return the dictionary
+ */
+xbt_dict_t gras_os_host_properties(void)
+{
+  return SIMIX_host_get_properties(SIMIX_process_get_host(SIMIX_process_self()));
+}
+
 /* **************************************************************************
  * Interface with SIMIX
  * **************************************************************************/
diff --git a/src/gras/Virtu/virtu_private.h b/src/gras/Virtu/virtu_private.h
index 4171d2e425..dc821d42c8 100644
--- a/src/gras/Virtu/virtu_private.h
+++ b/src/gras/Virtu/virtu_private.h
@@ -43,5 +43,4 @@ typedef struct {
 gras_procdata_t *gras_procdata_get(void);
 void *gras_libdata_by_name_from_procdata(const char *name, gras_procdata_t* pd);
    
-   
 #endif  /* GRAS_VIRTU_PRIVATE_H */
diff --git a/src/gras/Virtu/virtu_sg.h b/src/gras/Virtu/virtu_sg.h
index 9e2f4f50d5..dc654a8922 100644
--- a/src/gras/Virtu/virtu_sg.h
+++ b/src/gras/Virtu/virtu_sg.h
@@ -50,6 +50,5 @@ void *gras_libdata_by_name_from_remote(const char *name, smx_process_t p);
  * the same order, which is wrong if they init amok modules in different
  * order.
  */
-   
-   
+
 #endif /* VIRTU_SG_H */
diff --git a/src/include/simix/datatypes.h b/src/include/simix/datatypes.h
index a3fb79559f..349698d622 100644
--- a/src/include/simix/datatypes.h
+++ b/src/include/simix/datatypes.h
@@ -75,7 +75,6 @@ typedef struct s_smx_process {
    s_xbt_swag_hookup_t synchro_hookup;
    s_xbt_swag_hookup_t host_proc_hookup;
    void *data;			/**< @brief user data */
-
 } s_smx_process_t;
 /** @} */
 /** @brief Agent datatype  
diff --git a/src/include/simix/simix.h b/src/include/simix/simix.h
index 2b7502991e..e431e68016 100644
--- a/src/include/simix/simix.h
+++ b/src/include/simix/simix.h
@@ -11,6 +11,7 @@
 
 #include "xbt/misc.h"
 #include "xbt/fifo.h"
+#include "xbt/dict.h"
 #include "xbt/function_types.h"
 #include "simix/datatypes.h"
 #include "surf/surf.h"
@@ -50,7 +51,8 @@ typedef void *(*smx_creation_func_t)(/*name*/     const char *,
 				     /*userdata*/ void *,
 				     /*hostname*/ char *, 
 				     /* argc */   int,
-				     /* argv */   char **);
+				     /* argv */   char **,
+                                     /* props */ xbt_dict_t);
 XBT_PUBLIC(void) SIMIX_function_register_process_create(smx_creation_func_t function);
 XBT_PUBLIC(void) SIMIX_function_register_process_kill(void_f_pvoid_t function);
 XBT_PUBLIC(void) SIMIX_function_register_process_cleanup(void_f_pvoid_t function);
@@ -71,13 +73,15 @@ XBT_PUBLIC(smx_host_t *)SIMIX_host_get_table(void);
 XBT_PUBLIC(void) SIMIX_create_environment(const char *file);
 XBT_PUBLIC(smx_host_t) SIMIX_host_get_by_name(const char *name);
 
+XBT_PUBLIC(xbt_dict_t) SIMIX_host_get_properties(smx_host_t host);
+
 /* Two possible states, 1 - CPU ON and 0 CPU OFF */
 XBT_PUBLIC(int) SIMIX_host_get_state(smx_host_t host);
 
 /************************** Process handling *********************************/
 XBT_PUBLIC(smx_process_t) SIMIX_process_create(const char *name,
 					       xbt_main_func_t code, void *data,
-					       const char * hostname, int argc, char **argv);
+					       const char * hostname, int argc, char **argv, xbt_dict_t properties);
 
 XBT_PUBLIC(void) SIMIX_jprocess_create(const char *name, 
 				       smx_host_t host,
@@ -101,6 +105,8 @@ XBT_PUBLIC(void) SIMIX_process_suspend(smx_process_t process);
 XBT_PUBLIC(void) SIMIX_process_resume(smx_process_t process);
 XBT_PUBLIC(int) SIMIX_process_is_suspended(smx_process_t process);
 
+/*property handlers*/
+XBT_PUBLIC(xbt_dict_t) SIMIX_process_get_properties(smx_process_t host);
 
 /************************** Synchro handling **********************************/
 
diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 4b698aad8b..d05507dd0a 100644
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -141,6 +141,13 @@ typedef struct surf_model_public {
   void (*set_max_duration) (surf_action_t action, double duration); /**< Set the max duration of an action*/
   void (*set_priority) (surf_action_t action, double priority); /**< Set the priority of an action */
   const char *name; /**< Name of this model */
+
+  /*for the properties of the link*/
+  xbt_dict_t (*get_link_properties) (void* link);
+
+  /*for the properties of the cpu*/
+  xbt_dict_t (*get_cpu_properties) (void* cpu);
+
 } s_surf_model_public_t, *surf_model_public_t;
 
 /** \brief Private data available on all models
@@ -381,6 +388,7 @@ typedef struct surf_workstation_model_extension_public {
   surf_action_t(*communicate) (void *workstation_src,                  /**< Execute a communication amount between two workstations */
 			       void *workstation_dst, double size,
 			       double max_rate);
+
   surf_action_t(*execute_parallel_task) (int workstation_nb,           /**< Execute a parallel task on several workstations */
 					 void **workstation_list,
 					 double *computation_amount,
@@ -540,6 +548,31 @@ XBT_PUBLIC(double)surf_get_clock(void);
  */
 XBT_PUBLIC(void) surf_exit(void);
 
+/* Prototypes of the functions that handle the properties */
+void parse_properties(void);
+void free_string(void*);
+
+/*Add callback lists*/
+xbt_dynar_t STag_surfxml_platform_description_cb_list;
+xbt_dynar_t ETag_surfxml_platform_description_cb_list;
+xbt_dynar_t STag_surfxml_host_cb_list;
+xbt_dynar_t ETag_surfxml_host_cb_list;
+xbt_dynar_t STag_surfxml_router_cb_list;
+xbt_dynar_t ETag_surfxml_router_cb_list;
+xbt_dynar_t STag_surfxml_link_cb_list;
+xbt_dynar_t ETag_surfxml_link_cb_list;
+xbt_dynar_t STag_surfxml_route_cb_list;
+xbt_dynar_t ETag_surfxml_route_cb_list;
+xbt_dynar_t STag_surfxml_link_c_ctn_cb_list;
+xbt_dynar_t ETag_surfxml_link_c_ctn_cb_list;
+xbt_dynar_t STag_surfxml_process_cb_list;
+xbt_dynar_t ETag_surfxml_process_cb_list;
+xbt_dynar_t STag_surfxml_argument_cb_list;
+xbt_dynar_t ETag_surfxml_argument_cb_list;
+xbt_dynar_t STag_surfxml_prop_cb_list;
+xbt_dynar_t ETag_surfxml_prop_cb_list;
+
+XBT_PUBLIC(void) surfxml_add_callback(xbt_dynar_t cb_list, void_f_void_t function);
 
 SG_END_DECL()
 
diff --git a/src/msg/global.c b/src/msg/global.c
index 7109a43981..09623af70c 100644
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -54,7 +54,7 @@ void MSG_global_init(int *argc, char **argv)
     msg_global->max_channel = 0;
     msg_global->PID = 1;
 
-    SIMIX_function_register_process_create(_MSG_process_create_from_SIMIX);
+    SIMIX_function_register_process_create(_MSG_process_create_with_env_from_SIMIX);
     SIMIX_function_register_process_cleanup(__MSG_process_cleanup);
     SIMIX_function_register_process_kill(_MSG_process_kill_from_SIMIX);
   }
diff --git a/src/msg/host.c b/src/msg/host.c
index f11ea22603..2b933f9ee0 100644
--- a/src/msg/host.c
+++ b/src/msg/host.c
@@ -186,6 +186,32 @@ double MSG_get_host_speed(m_host_t h)
   return (SIMIX_host_get_speed(h->simdata->smx_host));
 }
 
+/** \ingroup m_host_management
+ * \brief Returns the value of a certain host property
+ *
+ * \param host a host
+ * \param name a property name
+ * \return value of a property
+ */
+const char* MSG_host_get_property_value(m_host_t host, char* name)
+{
+  return xbt_dict_get_or_null(MSG_host_get_properties(host), name);
+}
+
+/** \ingroup m_host_management
+ * \brief Returns a xbt_dynar_t consisting of the list of properties assigned to this host
+ *
+ * \param host a host
+ * \return a dict containing the properties
+ */
+xbt_dict_t MSG_host_get_properties(m_host_t host)
+{
+  xbt_assert0((host != NULL), "Invalid parameters");
+
+  return (SIMIX_host_get_properties(host->simdata->smx_host));
+}
+
+
 /** \ingroup msg_gos_functions
  * \brief Determine if a host is available.
  *
diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index 34afa548a3..6bd53d04ff 100644
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -69,6 +69,16 @@ void *_MSG_process_create_from_SIMIX(const char *name,
 						    argc, argv);
 }
 
+/* This function creates a MSG process with properties. It has the prototype by SIMIX_function_register_process_create */
+void *_MSG_process_create_with_env_from_SIMIX(const char *name,
+				     xbt_main_func_t code, void *data,
+				     char *hostname, int argc, char **argv, xbt_dict_t properties)
+{
+  m_host_t host = MSG_get_host_by_name(hostname);
+  return (void *) MSG_process_create_with_environment(name, code, data, host,
+						    argc, argv,properties);
+}
+
 
 /** \ingroup m_process_management
  * \brief Creates and runs a new #m_process_t.
@@ -112,7 +122,7 @@ m_process_t MSG_process_create_with_arguments(const char *name,
   simdata->argv = argv;
   simdata->s_process = SIMIX_process_create(name, code,
 					    (void *) process, host->name,
-					    argc, argv);
+					    argc, argv, NULL);
 
   if (SIMIX_process_self()) {
     simdata->PPID = MSG_process_get_PID(SIMIX_process_self()->data);
@@ -125,13 +135,75 @@ m_process_t MSG_process_create_with_arguments(const char *name,
   /* Process structure */
   process->name = xbt_strdup(name);
   process->simdata = simdata;
-  process->data = data;
+  process->data = data ;
 
   xbt_fifo_unshift(msg_global->process_list, process);
 
   return process;
 }
 
+/** \ingroup m_process_management
+ * \brief Creates and runs a new #m_process_t.
+
+ * A constructor for #m_process_t taking four arguments and returning the 
+ * corresponding object. The structure (and the corresponding thread) is
+ * created, and put in the list of ready process.
+ * \param name a name for the object. It is for user-level information
+   and can be NULL.
+ * \param code is a function describing the behavior of the agent. It
+   should then only use functions described in \ref
+   m_process_management (to create a new #m_process_t for example),
+   in \ref m_host_management (only the read-only functions i.e. whose
+   name contains the word get), in \ref m_task_management (to create
+   or destroy some #m_task_t for example) and in \ref
+   msg_gos_functions (to handle file transfers and task processing).
+ * \param data a pointer to any data one may want to attach to the new
+   object.  It is for user-level information and can be NULL. It can
+   be retrieved with the function \ref MSG_process_get_data.
+ * \param host the location where the new agent is executed.
+ * \param argc first argument passed to \a code
+ * \param argv second argument passed to \a code
+ * \param properties list a properties defined for this process
+ * \see m_process_t
+ * \return The new corresponding object.
+ */
+m_process_t MSG_process_create_with_environment(const char *name,
+					      xbt_main_func_t code,
+					      void *data, m_host_t host,
+					      int argc, char **argv, xbt_dict_t properties)
+{
+  simdata_process_t simdata = xbt_new0(s_simdata_process_t, 1);
+  m_process_t process = xbt_new0(s_m_process_t, 1);
+  xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters");
+
+  /* Simulator Data */
+  simdata->PID = msg_global->PID++;
+  simdata->waiting_task = NULL;
+  simdata->m_host = host;
+  simdata->argc = argc;
+  simdata->argv = argv;
+  simdata->s_process = SIMIX_process_create(name, code,
+					    (void *) process, host->name,
+					    argc, argv, properties);
+
+  if (SIMIX_process_self()) {
+    simdata->PPID = MSG_process_get_PID(SIMIX_process_self()->data);
+  } else {
+    simdata->PPID = -1;
+  }
+  simdata->last_errno = MSG_OK;
+
+
+  /* Process structure */
+  process->name = xbt_strdup(name);
+  process->simdata = simdata;
+  process->data = data ;
+
+  xbt_fifo_unshift(msg_global->process_list, process);
+
+  return process;
+
+}
 
 void _MSG_process_kill_from_SIMIX(void *p)
 {
@@ -287,6 +359,31 @@ const char *MSG_process_get_name(m_process_t process)
   return (process->name);
 }
 
+/** \ingroup m_process_management
+ * \brief Returns the value of a certain process property
+ *
+ * \param process a process
+ * \param name a property name
+ * \return value of a property
+ */
+const char* MSG_process_get_property_value(m_process_t process, char* name)
+{
+  return xbt_dict_get_or_null(MSG_process_get_properties(process), name);
+}
+
+/** \ingroup m_process_management
+ * \brief Return the list of properties
+ *
+ * This functions returns all the parameters associated with a process
+ */
+xbt_dict_t MSG_process_get_properties(m_process_t process)
+{
+   xbt_assert0((process != NULL), "Invalid parameters");
+
+  return (SIMIX_process_get_properties(((simdata_process_t)process->simdata)->s_process));
+
+}
+
 /** \ingroup m_process_management
  * \brief Return the PID of the current agent.
  *
diff --git a/src/msg/private.h b/src/msg/private.h
index 7032a3a9cc..56ea0b8e3b 100644
--- a/src/msg/private.h
+++ b/src/msg/private.h
@@ -108,6 +108,9 @@ void __MSG_process_cleanup(void *arg);
 void *_MSG_process_create_from_SIMIX(const char *name,
 				     xbt_main_func_t code, void *data,
 				     char * hostname, int argc, char **argv);
+void *_MSG_process_create_with_env_from_SIMIX(const char *name,
+				     xbt_main_func_t code, void *data,
+				     char *hostname, int argc, char **argv, xbt_dict_t properties);
 void _MSG_process_kill_from_SIMIX(void *p);
 
 
diff --git a/src/simdag/sd_link.c b/src/simdag/sd_link.c
index 0fbe322d27..c7a30c20fa 100644
--- a/src/simdag/sd_link.c
+++ b/src/simdag/sd_link.c
@@ -117,6 +117,33 @@ double SD_link_get_current_bandwidth(SD_link_t link) {
   return surf_workstation_model->extension_public->get_link_bandwidth(link->surf_link);
 }
 
+/**
+ * \brief Returns the value of a certain link property
+ *
+ * \param workstation a workstation
+ * \param name a property name
+ * \return value of a property
+ */
+const char* SD_link_get_property_value(SD_link_t link, char* name)
+{
+  return xbt_dict_get_or_null(SD_link_get_properties(link), name);
+}
+
+/**
+ * \brief Returns a xbt_dynar_t consisting of the list of properties assigned to a link
+ *
+ * \param link a link
+ * \return the dictionary containing the properties associated with the link
+ */
+xbt_dict_t SD_link_get_properties(SD_link_t link)
+{
+  SD_CHECK_INIT_DONE();
+  xbt_assert0((link != NULL), "Invalid parameters");
+
+  return (surf_workstation_model->common_public->get_link_properties(link->surf_link));
+
+}
+
 /**
  * \brief Returns the current latency of a link
  *
diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c
index 429ddc4dd4..b7e97e8ecd 100644
--- a/src/simdag/sd_workstation.c
+++ b/src/simdag/sd_workstation.c
@@ -129,6 +129,35 @@ const char* SD_workstation_get_name(SD_workstation_t workstation) {
   return surf_workstation_model->common_public->get_resource_name(workstation->surf_workstation);
 }
 
+/**
+ * \brief Returns the value of a certain workstation property
+ *
+ * \param workstation a workstation
+ * \param name a property name
+ * \return value of a property
+ */
+const char* SD_workstation_get_property_value(SD_workstation_t ws, char* name)
+{
+  return xbt_dict_get_or_null(SD_workstation_get_properties(ws), name);
+}
+
+
+/**
+ * \brief Returns a xbt_dynar_t consisting of the list of properties assigned to this workstation
+ *
+ * \param workstation a workstation
+ * \return the dictionary containing the properties associated with the workstation
+ */
+xbt_dict_t SD_workstation_get_properties(SD_workstation_t workstation)
+{
+  SD_CHECK_INIT_DONE();
+  xbt_assert0((workstation != NULL), "Invalid parameters");
+
+  return (surf_workstation_model->common_public->get_cpu_properties(workstation->surf_workstation));
+
+}
+
+
 /**
  * \brief Returns the route between two workstations
  *
diff --git a/src/simix/private.h b/src/simix/private.h
index 6938efd466..0b119fb842 100644
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -56,6 +56,7 @@ typedef struct s_smx_simdata_process {
   smx_cond_t cond;		/* cond on which the process is blocked  */
   int argc;			/* arguments number if any */
   char **argv;			/* arguments table if any */
+  xbt_dict_t properties;
 } s_smx_simdata_process_t;
 
 typedef struct s_smx_process_arg {
@@ -66,6 +67,7 @@ typedef struct s_smx_process_arg {
   int argc;
   char **argv;
   double kill_time;
+  xbt_dict_t properties;
 } s_smx_process_arg_t, *smx_process_arg_t;
 
 /********************************* Mutex and Conditional ****************************/
@@ -123,4 +125,6 @@ void __SIMIX_cond_wait(smx_cond_t cond);
 void __SIMIX_cond_display_actions(smx_cond_t cond);
 void __SIMIX_action_display_conditions(smx_action_t action);
 
+xbt_dict_t current_property_set;
+
 #endif
diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c
index 3771300191..f973d0bdce 100644
--- a/src/simix/smx_deployment.c
+++ b/src/simix/smx_deployment.c
@@ -10,6 +10,7 @@
 #include "private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
+#include "xbt/dict.h"
 #include "surf/surfxml_parse_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix,
@@ -36,6 +37,8 @@ static void parse_process_init(void)
   parse_argv[(parse_argc) - 1] = xbt_strdup(A_surfxml_process_function);
   surf_parse_get_double(&start_time, A_surfxml_process_start_time);
   surf_parse_get_double(&kill_time, A_surfxml_process_kill_time);
+
+  current_property_set = xbt_dict_new();
 }
 
 static void parse_argument(void)
@@ -58,6 +61,7 @@ static void parse_process_finalize(void)
     arg->argc = parse_argc;
     arg->argv = parse_argv;
     arg->kill_time = kill_time;
+    arg->properties = current_property_set;
 
     DEBUG3("Process %s(%s) will be started at time %f", arg->name,
 	   arg->hostname, start_time);
@@ -79,11 +83,11 @@ static void parse_process_finalize(void)
       process =
 	 (*simix_global->create_process_function)(parse_argv[0], parse_code,
 						NULL, parse_host,
-						parse_argc, parse_argv);
+						parse_argc, parse_argv, /*the props*/ current_property_set);
     else
       process =
 	  SIMIX_process_create(parse_argv[0], parse_code, NULL, parse_host,
-			       parse_argc, parse_argv);
+			       parse_argc, parse_argv, /*the props*/ current_property_set);
 
     if (kill_time > SIMIX_get_clock()) {
       if (simix_global->kill_process_function)
@@ -118,9 +122,11 @@ void SIMIX_launch_application(const char *file)
 {
   xbt_assert0(simix_global,
 	      "SIMIX_global_init has to be called before SIMIX_launch_application.");
-  STag_surfxml_process_fun = parse_process_init;
-  ETag_surfxml_argument_fun = parse_argument;
-  ETag_surfxml_process_fun = parse_process_finalize;
+  surfxml_add_callback(STag_surfxml_process_cb_list, parse_process_init);
+  surfxml_add_callback(ETag_surfxml_argument_cb_list, parse_argument);
+  surfxml_add_callback(STag_surfxml_prop_cb_list, parse_properties);
+  surfxml_add_callback(ETag_surfxml_process_cb_list, parse_process_finalize);
+
   surf_parse_open(file);
   xbt_assert1((!surf_parse()), "Parse error in %s", file);
   surf_parse_close();
diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index b5c77d19f8..5e3f7a86d7 100644
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -375,7 +375,7 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
 	DEBUG2("Launching %s on %s", args->name, args->hostname);
 	process = SIMIX_process_create(args->name, args->code,
 				       args->data, args->hostname,
-				       args->argc, args->argv);
+				       args->argc, args->argv, args->properties);
 	if (args->kill_time > SIMIX_get_clock()) {
 	  surf_timer_model->extension_public->set(args->kill_time,
 						     (void *)
diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c
index c532b2a4e2..c00faa5f64 100644
--- a/src/simix/smx_host.c
+++ b/src/simix/smx_host.c
@@ -210,6 +210,22 @@ smx_host_t SIMIX_host_get_by_name(const char *name)
   return NULL;
 }
 
+/**
+ * \brief Returns a xbt_dynar_t consisting of the list of properties assigned to this host
+ *
+ * \param host a host
+ * \return the dynamic array consisting of property names
+ */
+xbt_dict_t SIMIX_host_get_properties(smx_host_t host)
+{
+  xbt_assert0((host != NULL), "Invalid parameters");
+
+  return (surf_workstation_model->
+	  common_public->get_cpu_properties(host->simdata->host));
+
+}
+
+
 /**
  * \brief Return the state of a workstation
  *
diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index f9049524a9..52dc6c2218 100644
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -8,6 +8,7 @@
 #include "private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
+#include "xbt/dict.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix,
 				"Logging specific to SIMIX (process)");
@@ -54,7 +55,7 @@ void SIMIX_process_cleanup(void *arg)
 smx_process_t SIMIX_process_create(const char *name,
 				   xbt_main_func_t code, void *data,
 				   const char *hostname, int argc,
-				   char **argv)
+				   char **argv, /*props*/xbt_dict_t properties)
 {
   smx_simdata_process_t simdata = xbt_new0(s_smx_simdata_process_t, 1);
   smx_process_t process = xbt_new0(s_smx_process_t, 1);
@@ -79,6 +80,9 @@ smx_process_t SIMIX_process_create(const char *name,
   process->simdata = simdata;
   process->data = data;
 
+  /* Add properties*/
+  simdata->properties = properties;
+
   xbt_swag_insert(process, host->simdata->process_list);
 
   /* fix current_process, about which xbt_context_start mocks around */
@@ -92,7 +96,6 @@ smx_process_t SIMIX_process_create(const char *name,
 
   return process;
 }
-
 /** 
  * \brief Creates and runs a new #smx_process_t hosting a JAVA thread
  *
@@ -250,6 +253,16 @@ const char *SIMIX_process_get_name(smx_process_t process)
   return (process->name);
 }
 
+/** \ingroup m_process_management
+ * \brief Return the properties
+ *
+ * This functions returns the properties associated with this process
+ */
+xbt_dict_t SIMIX_process_get_properties(smx_process_t process)
+{
+  return process->simdata->properties;
+}
+
 /**
  * \brief Return the current agent.
  *
diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index 8abcbcb3e8..1f010285c1 100644
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -13,7 +13,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf,
 surf_cpu_model_t surf_cpu_model = NULL;
 lmm_system_t cpu_maxmin_system = NULL;
 
-xbt_dict_t cpu_set = NULL;
+xbt_dict_t cpu_set;
 
 static void cpu_free(void *cpu)
 {
@@ -25,7 +25,8 @@ static cpu_Cas01_t cpu_new(char *name, double power_scale,
 			   double power_initial,
 			   tmgr_trace_t power_trace,
 			   e_surf_cpu_state_t state_initial,
-			   tmgr_trace_t state_trace)
+			   tmgr_trace_t state_trace,
+			   xbt_dict_t cpu_properties)
 {
   cpu_Cas01_t cpu = xbt_new0(s_cpu_Cas01_t, 1);
 
@@ -47,42 +48,50 @@ static cpu_Cas01_t cpu_new(char *name, double power_scale,
       lmm_constraint_new(cpu_maxmin_system, cpu,
 			 cpu->power_current * cpu->power_scale);
 
+  /*add the property set*/
+  cpu->properties = cpu_properties;
+
+  current_property_set = cpu_properties;
+
   xbt_dict_set(cpu_set, name, cpu, cpu_free);
 
   return cpu;
 }
 
-static void parse_cpu(void)
+
+static void parse_cpu_init(void)
 {
-  char *name = NULL;
   double power_scale = 0.0;
   double power_initial = 0.0;
   tmgr_trace_t power_trace = NULL;
   e_surf_cpu_state_t state_initial = SURF_CPU_OFF;
   tmgr_trace_t state_trace = NULL;
 
-  name = xbt_strdup(A_surfxml_cpu_name);
-  surf_parse_get_double(&power_scale, A_surfxml_cpu_power);
-  surf_parse_get_double(&power_initial, A_surfxml_cpu_availability);
-  surf_parse_get_trace(&power_trace, A_surfxml_cpu_availability_file);
+  surf_parse_get_double(&power_scale, A_surfxml_host_power);
+  surf_parse_get_double(&power_initial, A_surfxml_host_availability);
+  surf_parse_get_trace(&power_trace, A_surfxml_host_availability_file);
 
-  xbt_assert0((A_surfxml_cpu_state == A_surfxml_cpu_state_ON) ||
-	      (A_surfxml_cpu_state == A_surfxml_cpu_state_OFF),
+  xbt_assert0((A_surfxml_host_state == A_surfxml_host_state_ON) ||
+	      (A_surfxml_host_state == A_surfxml_host_state_OFF),
 	      "Invalid state");
-  if (A_surfxml_cpu_state == A_surfxml_cpu_state_ON)
+  if (A_surfxml_host_state == A_surfxml_host_state_ON)
     state_initial = SURF_CPU_ON;
-  if (A_surfxml_cpu_state == A_surfxml_cpu_state_OFF)
+  if (A_surfxml_host_state == A_surfxml_host_state_OFF)
     state_initial = SURF_CPU_OFF;
-  surf_parse_get_trace(&state_trace, A_surfxml_cpu_state_file);
+  surf_parse_get_trace(&state_trace, A_surfxml_host_state_file); 
+
+  current_property_set = xbt_dict_new();
+  cpu_new(A_surfxml_host_id, power_scale, power_initial, power_trace, state_initial,
+	  state_trace, /*add the properties*/ current_property_set);
 
-  cpu_new(name, power_scale, power_initial, power_trace, state_initial,
-	  state_trace);
 }
 
 static void parse_file(const char *file)
 {
   surf_parse_reset_parser();
-  ETag_surfxml_cpu_fun = parse_cpu;
+  surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_init);
+  surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
+
   surf_parse_open(file);
   xbt_assert1((!surf_parse()), "Parse error in %s", file);
   surf_parse_close();
@@ -334,6 +343,11 @@ static double get_available_speed(void *cpu)
   return ((cpu_Cas01_t) cpu)->power_current;
 }
 
+static xbt_dict_t get_properties(void *cpu)
+{
+ return ((cpu_Cas01_t) cpu)->properties;
+}
+
 static void finalize(void)
 {
   xbt_dict_free(&cpu_set);
@@ -411,6 +425,8 @@ static void surf_cpu_model_init_internal(void)
   surf_cpu_model->extension_public->get_speed = get_speed;
   surf_cpu_model->extension_public->get_available_speed =
       get_available_speed;
+  /*manage the properties of the cpu*/
+  surf_cpu_model->common_public->get_cpu_properties = get_properties;
 
   if(!cpu_set) cpu_set = xbt_dict_new();
   if (!cpu_maxmin_system) cpu_maxmin_system = lmm_system_new();
diff --git a/src/surf/cpu_private.h b/src/surf/cpu_private.h
index d203c15aee..63017a446d 100644
--- a/src/surf/cpu_private.h
+++ b/src/surf/cpu_private.h
@@ -27,6 +27,8 @@ typedef struct cpu_Cas01 {
   e_surf_cpu_state_t state_current;
   tmgr_trace_event_t state_event;
   lmm_constraint_t constraint;
+  /*Handles the properties that can be added to cpu's*/
+  xbt_dict_t properties;
 } s_cpu_Cas01_t, *cpu_Cas01_t;
 
 extern xbt_dict_t cpu_set;
diff --git a/src/surf/network.c b/src/surf/network.c
index e2260814f6..488183322b 100644
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -45,7 +45,7 @@ static network_link_CM02_t network_link_new(char *name,
 					    state_initial,
 					    tmgr_trace_t state_trace,
 					    e_surf_network_link_sharing_policy_t
-					    policy)
+					    policy, xbt_dict_t properties)
 {
   network_link_CM02_t nw_link = xbt_new0(s_network_link_CM02_t, 1);
 
@@ -72,6 +72,10 @@ static network_link_CM02_t network_link_new(char *name,
   if (policy == SURF_NETWORK_LINK_FATPIPE)
     lmm_constraint_shared(nw_link->constraint);
 
+  nw_link->properties = properties;
+
+  current_property_set = properties;
+
   xbt_dict_set(network_link_set, name, nw_link, network_link_free);
 
   return nw_link;
@@ -105,46 +109,46 @@ static void route_new(int src_id, int dst_id,
       xbt_realloc(link_list, sizeof(network_link_CM02_t) * nb_link);
 }
 
-static void parse_network_link(void)
+static void parse_network_link_init(void)
 {
-  char *name;
+  char *name_link;
   double bw_initial;
   tmgr_trace_t bw_trace;
   double lat_initial;
   tmgr_trace_t lat_trace;
-  e_surf_network_link_state_t state_initial = SURF_NETWORK_LINK_ON;
-  e_surf_network_link_sharing_policy_t policy_initial =
-      SURF_NETWORK_LINK_SHARED;
+  e_surf_network_link_state_t state_initial_link = SURF_NETWORK_LINK_ON;
+  e_surf_network_link_sharing_policy_t policy_initial_link = SURF_NETWORK_LINK_SHARED;
   tmgr_trace_t state_trace;
 
-  name = xbt_strdup(A_surfxml_network_link_name);
-  surf_parse_get_double(&bw_initial, A_surfxml_network_link_bandwidth);
-  surf_parse_get_trace(&bw_trace, A_surfxml_network_link_bandwidth_file);
-  surf_parse_get_double(&lat_initial, A_surfxml_network_link_latency);
-  surf_parse_get_trace(&lat_trace, A_surfxml_network_link_latency_file);
+  name_link = xbt_strdup(A_surfxml_link_id);
+  surf_parse_get_double(&bw_initial, A_surfxml_link_bandwidth);
+  surf_parse_get_trace(&bw_trace, A_surfxml_link_bandwidth_file);
+  surf_parse_get_double(&lat_initial, A_surfxml_link_latency);
+  surf_parse_get_trace(&lat_trace, A_surfxml_link_latency_file);
+
+  xbt_assert0((A_surfxml_link_state ==
+	       A_surfxml_link_state_ON)
+	      || (A_surfxml_link_state ==
+		  A_surfxml_link_state_OFF), "Invalid state");
+  if (A_surfxml_link_state == A_surfxml_link_state_ON)
+    state_initial_link = SURF_NETWORK_LINK_ON;
+  else if (A_surfxml_link_state ==
+	   A_surfxml_link_state_OFF)
+    state_initial_link = SURF_NETWORK_LINK_OFF;
 
-  xbt_assert0((A_surfxml_network_link_state ==
-	       A_surfxml_network_link_state_ON)
-	      || (A_surfxml_network_link_state ==
-		  A_surfxml_network_link_state_OFF), "Invalid state");
-  if (A_surfxml_network_link_state == A_surfxml_network_link_state_ON)
-    state_initial = SURF_NETWORK_LINK_ON;
-  else if (A_surfxml_network_link_state ==
-	   A_surfxml_network_link_state_OFF)
-    state_initial = SURF_NETWORK_LINK_OFF;
+  if (A_surfxml_link_sharing_policy ==
+      A_surfxml_link_sharing_policy_SHARED)
+    policy_initial_link = SURF_NETWORK_LINK_SHARED;
+  else if (A_surfxml_link_sharing_policy ==
+	   A_surfxml_link_sharing_policy_FATPIPE)
+    policy_initial_link = SURF_NETWORK_LINK_FATPIPE;
 
-  if (A_surfxml_network_link_sharing_policy ==
-      A_surfxml_network_link_sharing_policy_SHARED)
-    policy_initial = SURF_NETWORK_LINK_SHARED;
-  else if (A_surfxml_network_link_sharing_policy ==
-	   A_surfxml_network_link_sharing_policy_FATPIPE)
-    policy_initial = SURF_NETWORK_LINK_FATPIPE;
+  surf_parse_get_trace(&state_trace, A_surfxml_link_state_file);
 
-  surf_parse_get_trace(&state_trace, A_surfxml_network_link_state_file);
+  network_link_new(name_link, bw_initial, bw_trace,
+		   lat_initial, lat_trace, state_initial_link, state_trace,
+		   policy_initial_link, xbt_dict_new());
 
-  network_link_new(name, bw_initial, bw_trace,
-		   lat_initial, lat_trace, state_initial, state_trace,
-		   policy_initial);
 }
 
 static int nb_link;
@@ -152,9 +156,13 @@ static int link_list_capacity;
 static network_link_CM02_t *link_list = NULL;
 static int src_id = -1;
 static int dst_id = -1;
+/*
+static int is_first = 0;
+*/
 
 static void parse_route_set_endpoints(void)
 {
+
   src_id = network_card_new(A_surfxml_route_src);
   dst_id = network_card_new(A_surfxml_route_dst);
   nb_link = 0;
@@ -164,6 +172,7 @@ static void parse_route_set_endpoints(void)
 
 static void parse_route_elem(void)
 {
+
   if (nb_link == link_list_capacity) {
     link_list_capacity *= 2;
     link_list =
@@ -171,7 +180,7 @@ static void parse_route_elem(void)
 		    (link_list_capacity) * sizeof(network_link_CM02_t));
   }
   link_list[nb_link++] =
-      xbt_dict_get_or_null(network_link_set, A_surfxml_route_element_name);
+      xbt_dict_get_or_null(network_link_set, A_surfxml_link_c_ctn_id);
 }
 
 static void parse_route_set_route(void)
@@ -182,17 +191,24 @@ static void parse_route_set_route(void)
 static void parse_file(const char *file)
 {
   int i;
-
+/*
+  surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
+  surfxml_add_callback(STag_surfxml_link_cb_list, &parse_network_link_init);
+  surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
+  surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem);
+  surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
+*/
   /* Figuring out the network links */
   surf_parse_reset_parser();
-  ETag_surfxml_network_link_fun = parse_network_link;
+  surfxml_add_callback(STag_surfxml_link_cb_list, &parse_network_link_init);
+  surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
   surf_parse_open(file);
   xbt_assert1((!surf_parse()), "Parse error in %s", file);
   surf_parse_close();
 
   /* Figuring out the network cards used */
   surf_parse_reset_parser();
-  STag_surfxml_route_fun = parse_route_set_endpoints;
+  surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
   surf_parse_open(file);
   xbt_assert1((!surf_parse()), "Parse error in %s", file);
   surf_parse_close();
@@ -201,9 +217,9 @@ static void parse_file(const char *file)
 
   /* Building the routes */
   surf_parse_reset_parser();
-  STag_surfxml_route_fun = parse_route_set_endpoints;
-  ETag_surfxml_route_element_fun = parse_route_elem;
-  ETag_surfxml_route_fun = parse_route_set_route;
+  surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
+  surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem);
+  surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
   surf_parse_open(file);
   xbt_assert1((!surf_parse()), "Parse error in %s", file);
   surf_parse_close();
@@ -216,7 +232,7 @@ static void parse_file(const char *file)
 	loopback = network_link_new(xbt_strdup("__MSG_loopback__"),
 				    498000000, NULL, 0.000015, NULL,
 				    SURF_NETWORK_LINK_ON, NULL,
-				    SURF_NETWORK_LINK_FATPIPE);
+				    SURF_NETWORK_LINK_FATPIPE,NULL);
       ROUTE_SIZE(i, i) = 1;
       ROUTE(i, i) = xbt_new0(network_link_CM02_t, 1);
       ROUTE(i, i)[0] = loopback;
@@ -531,6 +547,11 @@ static double get_link_latency(const void *link)
   return ((network_link_CM02_t) link)->lat_current;
 }
 
+static xbt_dict_t get_link_property_list(void *link)
+{
+ return ((network_link_CM02_t) link)->properties;
+}
+
 static void action_suspend(surf_action_t action)
 {
   ((surf_action_network_CM02_t) action)->suspended = 1;
@@ -656,6 +677,8 @@ static void surf_network_model_init_internal(void)
       get_link_bandwidth;
   surf_network_model->extension_public->get_link_latency =
       get_link_latency;
+  /*for the props of the link*/
+  surf_network_model->common_public->get_link_properties =  get_link_property_list;
 
   network_link_set = xbt_dict_new();
   network_card_set = xbt_dict_new();
diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c
index a193748a01..e1ba8706e0 100644
--- a/src/surf/network_gtnets.c
+++ b/src/surf/network_gtnets.c
@@ -46,7 +46,7 @@ static void network_link_free(void *nw_link)
 /* name: some name for the link, from the XML */
 /* bw: The bandwidth value            */
 /* lat: The latency value             */
-static void network_link_new(char *name, double bw, double lat)
+static void network_link_new(char *name, double bw, double lat, xbt_dict_t props)
 {
   static int link_count = -1;
   network_link_GTNETS_t gtnets_link;
@@ -87,6 +87,9 @@ static void network_link_new(char *name, double bw, double lat)
   gtnets_link->bw_current = bw;
   gtnets_link->lat_current = lat;
   gtnets_link->id = link_count;
+  /* Add the properties */
+  gtnets_link->properties = current_property_set;
+
   xbt_dict_set(network_link_set, name, gtnets_link, network_link_free);
 
   return;
@@ -177,8 +180,10 @@ static void route_onehop_new(int src_id, int dst_id, char **links,
   }
 }
 
+
+
 /* Parse the XML for a network link */
-static void parse_network_link(void)
+static void parse_network_link_init(void)
 {
   char *name;
   double bw;
@@ -213,10 +218,9 @@ static void parse_network_link(void)
 	  ("The GTNetS network model doesn't support link state traces");
 #endif
   }
-
-
   /* KF: remove several arguments to network_link_new */
-  network_link_new(name, bw, lat);
+  current_property_set = xbt_dict_new();
+  network_link_new(name, bw, lat, current_property_set);
 }
 
 static int nb_link = 0;
@@ -269,47 +273,20 @@ static void parse_route_set_onehop_route(void)
 /* Main XML parsing */
 static void parse_file(const char *file)
 {
-  /* Figuring out the network links */
   surf_parse_reset_parser();
-  ETag_surfxml_network_link_fun = parse_network_link;
-  surf_parse_open(file);
-  xbt_assert1((!surf_parse()), "Parse error in %s", file);
-  surf_parse_close();
 
-  /* Figuring out the network cards used */
-  /* KF
-     surf_parse_reset_parser();
-     STag_surfxml_route_fun=parse_route_set_endpoints;
-     surf_parse_open(file);
-     xbt_assert1((!surf_parse()),"Parse error in %s",file);
-     surf_parse_close();
-   */
-
-  /* KF: Figuring out the router (considered as part of
-     network cards) used. */
-  surf_parse_reset_parser();
-  STag_surfxml_router_fun = parse_route_set_routers;
-  surf_parse_open(file);
-  xbt_assert1((!surf_parse()), "Parse error in %s", file);
-  surf_parse_close();
+  surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
+  surfxml_add_callback(STag_surfxml_router_cb_list, &parse_route_set_routers);
+  surfxml_add_callback(STag_surfxml_network_link_cb_list, &parse_network_link_init);
+  surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
+  surfxml_add_callback(ETag_surfxml_route_element_cb_list, &parse_route_elem);
+  surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_onehop_route);
+  surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
 
-  /* Building the one-hop routes */
-  surf_parse_reset_parser();
-  STag_surfxml_route_fun = parse_route_set_endpoints;
-  ETag_surfxml_route_element_fun = parse_route_elem;
-  ETag_surfxml_route_fun = parse_route_set_onehop_route;
   surf_parse_open(file);
   xbt_assert1((!surf_parse()), "Parse error in %s", file);
   surf_parse_close();
 
-  /* Building the routes */
-  surf_parse_reset_parser();
-  STag_surfxml_route_fun = parse_route_set_endpoints;
-  ETag_surfxml_route_element_fun = parse_route_elem;
-  ETag_surfxml_route_fun = parse_route_set_route;
-  surf_parse_open(file);
-  xbt_assert1((!surf_parse()), "Parse error in %s", file);
-  surf_parse_close();
 }
 
 static void *name_service(const char *name)
@@ -322,6 +299,12 @@ static const char *get_resource_name(void *resource_id)
   return ((network_card_GTNETS_t) resource_id)->name;
 }
 
+static xbt_dict_t get_link_property_list(void *link)
+{
+  return ((network_card_GTNETS_t) link)->properties;
+}
+
+
 /* We do not care about this: only used for traces */
 static int resource_used(void *resource_id)
 {
@@ -603,6 +586,9 @@ static void surf_network_model_init_internal(void)
 
   surf_network_model->extension_public->communicate = communicate;
 
+  /*for the props of the link*/
+  surf_network_model->common_public->get_link_properties =  get_link_property_list;
+
   network_link_set = xbt_dict_new();
   network_card_set = xbt_dict_new();
 
diff --git a/src/surf/network_gtnets_private.h b/src/surf/network_gtnets_private.h
index e065992be0..a8d79c0874 100644
--- a/src/surf/network_gtnets_private.h
+++ b/src/surf/network_gtnets_private.h
@@ -20,6 +20,8 @@ typedef struct network_link_GTNETS {
   double bw_current;
   double lat_current;
   int id;
+  /*holds the properties associated witht the link*/
+  xbt_dict_t properties;
 } s_network_link_GTNETS_t, *network_link_GTNETS_t;
 
 
diff --git a/src/surf/network_private.h b/src/surf/network_private.h
index 0bc3f3d373..4cc3cf0529 100644
--- a/src/surf/network_private.h
+++ b/src/surf/network_private.h
@@ -24,6 +24,8 @@ typedef struct network_link_CM02 {
   e_surf_network_link_state_t state_current;
   tmgr_trace_event_t state_event;
   lmm_constraint_t constraint;
+  /*holds the properties associated with a link*/
+  xbt_dict_t properties;
 } s_network_link_CM02_t, *network_link_CM02_t;
 
 
diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index e690b1c477..e417d40497 100644
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -17,6 +17,8 @@
 #define NO_MAX_DURATION -1.0
 #define SG_TCP_CTE_GAMMA 20000.0
 
+xbt_dict_t current_property_set;
+
 extern const char *surf_action_state_names[6];
 
 typedef enum {
@@ -66,7 +68,6 @@ FILE * surf_fopen(const char *name, const char *mode);
 extern tmgr_history_t history;
 extern xbt_dynar_t surf_path;
 
-
 /*
  * Returns the initial path. On Windows the initial path is
  * the current directory for the current process in the other
diff --git a/src/surf/surfxml.c b/src/surf/surfxml.c
index c029d6dd0f..d5adbd6f5f 100644
--- a/src/surf/surfxml.c
+++ b/src/surf/surfxml.c
@@ -379,8 +379,8 @@ static void yy_fatal_error (yyconst char msg[]  );
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 198
-#define YY_END_OF_BUFFER 199
+#define YY_NUM_RULES 202
+#define YY_END_OF_BUFFER 203
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -388,7 +388,7 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[1531] =
+static yyconst flex_int16_t yy_accept[1517] =
     {   0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
@@ -399,165 +399,164 @@ static yyconst flex_int16_t yy_accept[1531] =
         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,    0,    0,  199,  197,
-
-       23,   10,   10,   23,   23,  177,   10,  177,    5,    6,
-        5,    8,    9,    8,  193,  185,  186,  194,  191,  194,
-      192,  196,  185,  186,  196,  197,   30,   10,   30,   30,
-       30,   28,   30,   34,   10,   34,   34,  197,  197,   34,
-      197,   41,   10,   41,   41,   41,   39,   41,   45,   10,
-       45,  197,   72,   10,   72,   72,   72,   70,   72,   72,
-       72,   72,   72,   72,   76,   10,   76,  197,   83,   10,
-       83,   83,   83,   81,   83,   87,   10,   87,  197,  112,
-       10,  112,  112,  112,  110,  112,  112,  112,  112,  116,
-       10,  116,  197,  133,   10,  133,  133,  133,  131,  133,
-
-      133,  133,  137,   10,  137,  197,  137,  197,  144,   10,
-      144,  144,  144,  142,  144,  148,   10,  148,  197,  161,
-       10,  161,  161,  161,  159,  161,  161,  161,  161,  165,
-       10,  165,  197,  165,  197,  172,   10,  172,  172,  172,
-      170,  172,  176,   10,  176,  194,  193,   10,    0,    2,
-        2,    0,    4,    7,  188,  187,    0,    0,    0,    0,
-        0,    0,    0,   29,   31,   31,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       40,   42,   42,    0,   71,   73,   73,   73,   73,   73,
-       73,   73,    0,    0,   82,   84,   84,    0,  111,  113,
-
-      113,  113,  113,  113,  113,    0,    0,  132,  134,  134,
-      134,  134,    0,    0,    0,  143,  145,  145,    0,    0,
-      160,  162,  162,  162,  162,  162,    0,    0,  171,  173,
-      173,    0,    0,    0,    0,    0,    0,    0,    3,    0,
-        0,    0,    0,    0,    0,    0,  195,    0,   31,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,   42,    0,    0,   73,   73,
-       73,   73,   73,   73,    0,    0,    0,   84,    0,    0,
-      113,  113,  113,  113,  113,    0,    0,    0,  134,  134,
-      134,    0,    0,    0,    0,  145,    0,    0,  162,  162,
-
-      162,  162,    0,    0,    0,  173,    0,    0,    0,  190,
-        0,   22,    1,    0,    0,  183,    0,    0,    0,  180,
-      179,    0,    0,   31,    0,    0,   33,    0,    0,   47,
-        0,    0,    0,    0,    0,   46,    0,    0,    0,    0,
-        0,    0,   42,    0,    0,   44,    0,   73,   73,   73,
-       73,   73,   73,    0,    0,   75,    0,    0,   84,    0,
-        0,   86,    0,  113,  113,  113,  113,  113,    0,    0,
-      115,    0,    0,    0,    0,  134,    0,    0,    0,    0,
-      136,    0,    0,    0,  145,    0,    0,  147,    0,  162,
-      162,  162,  162,    0,    0,  164,    0,    0,  173,    0,
-
-        0,  175,    0,    0,    0,    0,  184,  178,    0,    0,
-        0,   31,    0,    0,   47,    0,    0,    0,    0,    0,
-       46,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       73,   73,   73,    0,    0,   73,   73,    0,    0,    0,
-        0,    0,  113,  113,    0,    0,  113,  113,    0,    0,
-        0,  122,  121,  134,    0,  120,  119,    0,    0,    0,
-        0,    0,    0,  162,    0,    0,  162,  162,    0,    0,
-      173,    0,    0,    0,    0,    0,   12,    0,  181,  182,
-        0,   31,    0,    0,    0,    0,    0,    0,  118,    0,
-      118,    0,  117,    0,  117,    0,   38,   37,    0,   73,
-
-       73,   73,    0,   49,   48,    0,    0,    0,    0,   73,
-        0,   74,    0,    0,   80,   79,    0,  113,  113,    0,
-       91,   90,  113,    0,    0,  113,    0,  118,  134,    0,
-      117,    0,    0,  141,  140,    0,  162,    0,  152,  151,
-      162,  162,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   11,    0,   31,    0,    0,    0,    0,    0,    0,
-      118,    0,   78,    0,   77,    0,  117,    0,    0,   73,
-       73,   73,    0,   51,   50,    0,    0,    0,   73,    0,
-      113,  113,  113,    0,    0,    0,  113,    0,  134,    0,
-        0,    0,  162,  162,  162,    0,    0,    0,  169,  168,
 
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       36,    0,    0,  150,    0,   78,    0,   77,  149,   35,
-        0,   73,   73,   73,    0,    0,   73,    0,  113,    0,
-        0,  113,  113,    0,    0,  113,    0,  134,    0,  135,
-        0,    0,  162,  162,  162,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,   27,   26,    0,  166,   36,    0,
-        0,  150,    0,    0,  149,   35,    0,   73,   73,   73,
-        0,    0,    0,    0,   73,    0,   85,  113,    0,   97,
-       96,  113,  113,    0,    0,    0,    0,  113,    0,  134,
-        0,    0,    0,    0,  162,  162,    0,  167,    0,  189,
-
-        0,    0,    0,    0,    0,  166,    0,    0,    0,    0,
-        0,   43,   73,   73,   73,    0,   57,    0,   56,   73,
-        0,    0,  113,  113,  113,    0,  101,    0,  100,  113,
-        0,  134,    0,    0,    0,  154,  153,    0,    0,  162,
-        0,  163,  167,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,   73,   73,
-       73,   59,   58,    0,    0,    0,   93,   92,  113,  113,
-      113,  103,  102,    0,    0,    0,  134,  134,    0,    0,
-        0,  158,  157,    0,    0,    0,  174,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-
-        0,    0,   73,   73,   73,    0,   61,   60,  113,  113,
-      113,    0,  105,  104,    0,  134,  134,    0,    0,    0,
-      156,  155,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,   89,    0,    0,   88,    0,    0,   73,
-       73,   73,  113,    0,    0,  113,    0,  134,  134,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,   89,    0,  138,   88,    0,   53,   52,
-       73,   73,   73,   73,  113,    0,   99,   98,  113,    0,
-        0,    0,  134,    0,    0,  134,  139,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,  203,  201,
+       24,   10,   10,   24,   24,  181,   10,  181,    5,    6,
+        5,    8,    9,    8,  197,  189,  190,  198,  195,  198,
+      196,  200,  189,  190,  200,  201,   30,   10,   30,   30,
+       30,   28,   30,   34,   10,   34,  201,   34,   34,  201,
+       34,   34,  201,   34,  201,   34,  201,  201,   34,   40,
+       10,   40,   40,   40,   38,   40,   44,   10,   44,   70,
+
+       10,   70,   70,   70,   68,   70,   70,   70,   70,   70,
+       74,   10,   74,  201,   74,   82,   10,   82,   82,   82,
+       80,   82,   82,   86,   10,   86,   92,   10,   92,   92,
+       92,   90,   92,   96,   10,   96,  120,   10,  120,  120,
+      120,  118,  120,  120,  120,  120,  124,   10,  124,  124,
+      140,   10,  140,  140,  140,  138,  140,  140,  140,  144,
+       10,  144,  201,  144,  150,   10,  150,  150,  150,  148,
+      150,  154,   10,  154,  166,   10,  166,  166,  166,  164,
+      166,  166,  166,  166,  170,   10,  170,  201,  170,  201,
+      176,   10,  176,  176,  176,  174,  176,  180,   10,  180,
+
+      198,  197,   10,    0,    2,    2,    0,    4,    7,  192,
+      191,    0,    0,    0,    0,    0,    0,    0,   29,   31,
+       31,    0,    0,    0,    0,    0,    0,    0,    0,   39,
+       41,   41,    0,   69,   71,   71,   71,   71,   71,   71,
+       71,    0,    0,   81,   83,   83,   83,    0,   91,   93,
+       93,    0,  119,  121,  121,  121,  121,  121,  121,    0,
+      139,  141,  141,  141,  141,    0,    0,  149,  151,  151,
+        0,  165,  167,  167,  167,  167,  167,    0,    0,  175,
+      177,  177,    0,    0,    0,    0,    0,    0,    0,    3,
+        0,    0,    0,    0,    0,    0,    0,  199,    0,   31,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   41,
+        0,    0,   71,    0,    0,   71,   71,   71,   71,    0,
+        0,    0,    0,    0,   83,    0,    0,    0,    0,    0,
+        0,  121,    0,    0,  121,  121,  121,    0,    0,  141,
+      141,  141,    0,    0,    0,    0,    0,    0,    0,  167,
+      167,  167,  167,    0,    0,    0,  177,    0,    0,    0,
+      194,    0,   23,    1,    0,    0,  187,    0,    0,    0,
+      184,  183,    0,    0,   31,    0,    0,   33,    0,    0,
+        0,    0,    0,    0,    0,    0,   41,    0,    0,   43,
+        0,   71,    0,   47,   46,   71,   71,   71,   71,    0,
+
+        0,   73,    0,    0,    0,   77,   76,   83,    0,    0,
+       85,    0,    0,   89,   88,    0,    0,   95,    0,  121,
+        0,   99,   98,  121,  121,  121,    0,    0,  123,    0,
+        0,    0,  141,    0,    0,    0,    0,  143,    0,    0,
+        0,  147,  146,    0,    0,  153,    0,  167,  167,  167,
+      167,    0,    0,  169,    0,    0,  177,    0,    0,  179,
+        0,    0,    0,    0,  188,  182,    0,    0,    0,   31,
+        0,   45,    0,   97,    0,    0,    0,    0,    0,    0,
+        0,   71,   71,   71,   71,   71,    0,   75,   83,    0,
+        0,  121,  121,  121,  121,    0,    0,  129,  128,  141,
+
+        0,  127,  126,    0,    0,    0,  167,    0,    0,  167,
+      167,    0,    0,  177,    0,    0,    0,    0,    0,   12,
+        0,  185,  186,    0,   31,    0,   45,    0,   97,    0,
+      125,  125,    0,    0,   37,   36,    0,   71,   71,   71,
+        0,    0,    0,    0,   71,    0,   75,    0,    0,    0,
+        0,  121,  121,  121,    0,    0,  121,    0,  141,    0,
+        0,    0,  167,    0,  157,  156,  167,  167,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   11,    0,   31,
+        0,    0,    0,  125,   87,    0,   71,   71,   71,    0,
+       49,   48,    0,    0,    0,   71,    0,   72,    0,   79,
+
+       78,    0,   84,    0,  121,  121,  121,    0,    0,    0,
+      121,    0,  122,  141,    0,    0,    0,  167,  167,  167,
+        0,    0,    0,  173,  172,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,   35,  155,   87,    0,   71,   71,
+       71,    0,    0,   71,    0,  121,    0,    0,  121,  121,
+        0,    0,  121,  141,    0,  142,    0,    0,  167,  167,
+      167,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+       27,   26,    0,   35,  155,    0,   71,   71,   71,    0,
+        0,    0,    0,   71,    0,   94,  121,    0,  105,  104,
+      121,  121,    0,    0,    0,    0,  121,  141,  145,    0,
+
+        0,    0,  167,  167,    0,  171,    0,  193,    0,    0,
+        0,    0,    0,    0,   42,   71,   71,   71,    0,   55,
+        0,   54,   71,    0,    0,  121,  121,  121,    0,  109,
+        0,  108,  121,  141,  145,    0,    0,  159,  158,    0,
+        0,  167,    0,  168,  171,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,   71,   71,   71,   57,
+       56,    0,    0,    0,  101,  100,  121,  121,  121,  111,
+      110,    0,    0,  141,  141,    0,  152,    0,  163,  162,
+        0,    0,    0,  178,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   71,   71,   71,    0,   59,
+
+       58,  121,  121,  121,    0,  113,  112,  141,  141,    0,
+      161,  160,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   71,   71,   71,  121,    0,
+        0,  121,  141,  141,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,   51,   50,
+       71,   71,   71,   71,  121,    0,  107,  106,  121,    0,
+        0,  141,    0,    0,  141,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   71,   71,   71,   71,    0,    0,    0,    0,    0,
+      133,  132,  141,    0,  131,  130,  141,    0,    0,    0,
 
-        0,    0,    0,  138,   73,   73,   73,   73,    0,    0,
-        0,    0,    0,  114,    0,  126,  125,  134,    0,  124,
-      123,  134,  139,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   73,   73,   73,   73,    0,   95,   94,    0,    0,
-        0,  134,  134,    0,  146,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   12,    0,   12,    0,
-        0,    0,    0,   73,   73,   73,   73,    0,    0,    0,
-        0,  134,  134,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,   71,   71,   71,   71,    0,  103,
+      102,    0,    0,    0,  141,  141,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,   12,    0,
+       12,    0,    0,    0,   71,   71,   71,   71,    0,    0,
+        0,    0,  141,  141,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,   71,    0,    0,    0,
+        0,    0,    0,  141,  141,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   53,
+
+       52,    0,   63,   62,    0,   61,   60,   71,    0,   67,
+       66,    0,    0,    0,    0,  141,  141,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   11,    0,    0,
+       71,    0,    0,    0,    0,  141,  141,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   25,    0,   71,
+        0,    0,    0,    0,  141,  141,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,   25,    0,   71,    0,
+        0,    0,    0,  141,  141,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   32,
+        0,    0,    0,  115,    0,  114,  141,  141,    0,    0,
 
-        0,    0,    0,    0,    0,   73,    0,    0,    0,    0,
-        0,    0,  134,  134,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,   55,   54,
-        0,   65,   64,    0,   63,   62,   73,    0,   69,   68,
-        0,    0,    0,    0,  134,  134,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,   11,    0,    0,    0,   73,
-        0,    0,    0,    0,  134,  134,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,   25,    0,   24,   73,    0,
-        0,    0,    0,  134,  134,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,   25,    0,   24,   73,    0,
-
-        0,    0,    0,  134,  134,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   32,    0,    0,    0,
-      107,    0,  106,  134,  134,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,   67,   66,  109,
-      108,  134,  134,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  134,  134,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,  134,  134,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,  134,  134,
+        0,    0,    0,   65,   64,  117,  116,  141,  141,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,  141,  141,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  141,  141,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,  141,  141,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  141,  141,    0,    0,    0,
 
-        0,    0,    0,    0,    0,  134,  134,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  134,  134,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,  141,  141,    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,
-      130,  129,    0,  128,  127,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  137,  136,    0,  135,  134,    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,    0,    0,    0,    0,    0,    0,   13,    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,    0,   15,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       18,    0,    0,   14,    0,    0,    0,    0,    0,   17,
-        0,    0,    0,   19,    0,    0,    0,    0,    0,    0,
+        0,    0,   19,    0,    0,    0,   13,    0,    0,    0,
+        0,    0,    0,   21,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   15,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   18,    0,    0,
+       14,    0,    0,    0,    0,   16,    0,   20,    0,   17,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 
-        0,    0,    0,    0,    0,    0,    0,    0,   16,    0,
-        0,    0,    0,    0,    0,   20,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,   21,    0
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,   22,    0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -569,13 +568,13 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,   10,   11,   12,   13,   13,   13,
        13,   13,   13,   13,   13,   13,   13,   14,   15,   16,
        17,   18,   19,    1,   20,   21,   22,   23,   24,   25,
-       14,   26,   27,   14,   14,   14,   28,   29,   30,   31,
-       14,   32,   33,   34,   14,   14,   14,   14,   35,   14,
-       36,    1,   37,    1,   38,    1,   39,   40,   41,   42,
+       26,   27,   28,   26,   26,   26,   29,   30,   31,   32,
+       26,   33,   34,   35,   26,   26,   26,   26,   36,   26,
+       37,    1,   38,    1,   39,    1,   40,   41,   42,   43,
 
-       43,   44,   45,   46,   47,   14,   48,   49,   50,   51,
-       52,   53,   54,   55,   56,   57,   58,   59,   60,   61,
-       62,   14,    1,    1,    1,    1,    1,    1,    1,    1,
+       44,   45,   46,   47,   48,   26,   49,   50,   51,   52,
+       53,   54,   55,   56,   57,   58,   59,   60,   61,   62,
+       63,   26,    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,
@@ -592,1326 +591,1351 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[63] =
+static yyconst flex_int32_t yy_meta[64] =
     {   0,
         1,    2,    2,    2,    1,    1,    1,    1,    1,    3,
         3,    1,    4,    5,    1,    1,    1,    6,    1,    7,
         7,    7,    7,    7,    7,    5,    5,    5,    5,    5,
-        5,    5,    5,    5,    5,    1,    1,    5,    7,    7,
-        7,    7,    7,    7,    5,    5,    5,    5,    5,    5,
+        5,    5,    5,    5,    5,    5,    1,    1,    5,    7,
+        7,    7,    7,    7,    7,    5,    5,    5,    5,    5,
         5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-        5,    5
+        5,    5,    5
     } ;
 
-static yyconst flex_int16_t yy_base[1592] =
+static yyconst flex_int16_t yy_base[1585] =
     {   0,
         0,    0,    0,    3,    6,    9,   24,   27,   11,   14,
        15,   17,   29,   38,   45,   52,   59,   61,   67,   70,
-       98,  157,   73,   76,  116,  120,  123,  126,  175,  179,
-      182,  185,  201,  204,  207,  210,  225,  228,  244,  288,
-      262,  266,  269,  306,  332,    0,  310,  313,  393,  396,
-      412,  463,  430,  434,  437,  440,  514,  570,  481,  485,
-      488,  491,  626,  682,  532,  536,  539,  542,  588,  592,
-      595,  598,  644,  648,  738,  789,  651,  654,  700,  704,
-      840,  896,  707,  710,  756,  760,  763,  766,  807,  811,
-      814,  817,  952, 1011,  858,  862,  879,  914, 4148, 4149,
-
-     4149,   91,  141,   47,   62, 4149,  144,  132, 4149, 4149,
-     4137, 4149, 4149, 4128, 4149, 4141, 4141,  882, 4149, 4149,
-     4149, 4149, 4139, 4139, 4104,  214, 4149,  150, 4122,    0,
-      136, 4149, 4096, 4149,  232, 1020, 1033, 1038, 1057, 1078,
-      919, 4149,  235, 4120,    0,  440, 4149, 4090, 4149,  272,
-      442,  849, 4149,  316, 4118,    0,  491, 4149, 4076, 4083,
-     4094, 4093, 4079, 4073, 4149,  399,  493,  548, 4149,  402,
-     4111,    0,  542, 4149, 4089, 4149,  613,  660,  819, 4149,
-      620, 4109,    0,  656, 4149, 4087, 4086, 4085,   92, 4149,
-      674,  716,  817, 4149,  728, 4105,    0,  661, 4149, 4066,
-
-     4071, 4065, 4149,  781, 1087, 1096, 1111,  874, 4149,  784,
-     4101,    0,  717, 4149, 4079, 4149,  943,  929,  866, 4149,
-      970, 4099,    0,  862, 4149, 4058, 4063, 4067, 4056, 4149,
-      973, 1134, 1149, 1158, 1030, 4149,  976, 4094,    0,  875,
-     4149, 4072, 4149,  979,  979, 4105, 4072,  983,   34, 4047,
-     4149, 4097, 4088, 4149, 4149, 4149,   26,   32, 4048, 4047,
-     4045, 4084, 4052, 4149,    0, 4045, 4046, 4043, 4044, 4045,
-     4052,   35, 4042, 4040, 4049, 4039,   42, 4038, 4038, 4036,
-     4149,    0, 4038, 4039, 4149,    0, 4046, 4027, 4022, 4032,
-     4021, 4041, 4038, 4026, 4149,    0, 4027, 4021, 4149,    0,
-
-     4024, 4017, 4023, 4033, 4032, 4019, 4017, 4149,    0, 4011,
-     4014, 4025, 4010, 4012, 4011, 4149,    0, 4012, 4006, 4005,
-     4149,    0, 4008, 4002, 4008, 4017, 4002, 3999, 4149,    0,
-     4004, 4013, 4015, 4032, 4031, 4038,    5, 3997, 4149,  118,
-        0, 3993, 3993, 4029, 4028, 3990, 4149, 4002, 3984,  990,
-     1038, 3994, 3980, 3996, 3979, 3996, 3982, 3975, 3974, 3974,
-     3972, 3977, 3970, 3986, 3968, 3982, 1118, 1176, 3977, 3980,
-     3984, 3978, 3977, 3962, 1153, 1180, 3960, 3974, 1189, 1212,
-     3974, 3972, 3971, 3958, 3955, 1216, 1219, 3953,  993, 3971,
-     1051, 1222, 1239, 3951, 3950, 3964, 1242, 1245, 3965, 3948,
-
-     3955, 3948, 1248, 1251, 3957, 3943, 1268, 1271, 3978, 4149,
-     3981, 4149, 4149,  174, 3949, 4149, 3982, 3981, 3939, 4149,
-     4149, 3937, 3936, 3945, 1274, 1277, 4149, 1280, 3933,  997,
-     3941, 3929, 3931, 3946, 3929, 1000, 3925, 3927, 3942, 3925,
-     3932, 3923, 1061, 1297, 1300, 4149, 1305, 3930, 3923, 3925,
-     1157, 3921, 3932, 1309, 1318, 4149, 1326, 3917, 1330, 1335,
-     1338, 4149, 1346, 3913, 3921, 1355, 3924, 3927, 1358, 1363,
-     4149, 1367, 3912, 1371, 1387, 3927, 1375, 1396, 1404, 1407,
-     4149, 1410, 3910, 3909, 1413, 1416, 1429, 4149, 1433, 3908,
-     1436, 3926, 3906, 1439, 1442, 4149, 1446, 3904, 3918, 1452,
-
-     1459, 4149, 1463, 3937,  122, 1469, 4149, 4149, 3944, 3943,
-     3913, 3904, 1472, 3905, 1003, 3896, 3901, 3908, 3908, 3907,
-     1476, 3897, 3905, 3904, 3903, 3887, 3901, 1480, 1490, 1498,
-     3904, 3898, 3883, 1501, 1508, 1517, 1520, 1523, 3897, 1528,
-     1540, 1536, 3892, 3897, 1548, 1553, 3886, 1564, 1567, 3893,
-     1570, 4149, 4149, 3878, 1580, 4149, 4149, 1588, 3891, 3890,
-     1592, 1595, 1608, 3885, 1611, 1614, 3874, 3892, 1628, 3879,
-     1631, 1634, 3908,  162, 3909, 1637, 4149, 3908, 4149, 4149,
-     3873, 3873, 1640, 3880, 3880, 3866, 3868, 3863, 1647, 3863,
-     1657, 3861, 1660, 3874, 1668, 1672, 4149, 4149, 1664, 3875,
-
-     3871, 3856, 1684, 4149, 4149, 1697, 1701, 1714, 1723, 3868,
-     1717, 4149, 3856, 1734, 4149, 4149, 1742, 3868, 3847, 1745,
-     4149, 4149, 3863, 1753, 1759, 3863, 1769, 1772, 3868, 1775,
-     1778, 3867, 1786, 4149, 4149, 1794, 3852, 1797, 4149, 4149,
-     3856, 3845, 1805, 3858, 1811, 1823, 1832, 3866,  184,   70,
-      181, 4149, 3844, 1836, 1839, 3847, 3854, 3848, 3840, 3838,
-     1842, 3850, 1852, 3844, 1856, 3835, 1859, 3847, 1862, 3842,
-     3833, 3842, 1865, 4149, 4149, 1875, 3856, 3855, 3837, 1883,
-     3826, 1886, 3844, 1890, 3851, 3850, 3832, 1903, 3826, 1907,
-     3834, 1910, 3825, 3825, 3827, 1913, 3822, 1930, 4149, 4149,
-
-     1938, 3852,  259,  261,  203, 3821, 1942, 1948, 1958, 3813,
-     1916, 3831, 3818, 1961, 3818, 1964, 3828, 1968, 1971, 1975,
-     1980, 3816, 3821, 3811,  193,  298, 3813, 1983, 3815, 1986,
-     1990, 3816, 3806,  382,  426, 3809, 2002, 3806, 2006, 4149,
-     3807, 2012, 2015, 3812, 3804, 2023, 3796, 2031, 3816, 2034,
-      269,   94, 3813, 2042, 4149, 4149, 2054, 2057, 2060, 3801,
-     3811, 2063, 3805, 3798, 2066, 2071, 2074, 3799, 3794, 3797,
-     3818, 3836, 3816, 3831, 3796, 2081, 4149, 2084, 2087, 4149,
-     4149, 3791, 3785, 3811, 3829, 3809, 3824, 3789, 2103, 3793,
-     3787, 2106, 2109, 2114, 2125, 3786, 2128, 2131, 2134, 4149,
-
-     2190,  444,  153, 3786, 2141, 2145, 3780, 3784, 3775, 3777,
-     2154, 4149, 3766, 3781, 3770, 3814, 4149, 3810, 4149, 2158,
-     2161, 2164, 3774, 3768, 3767, 3809, 4149, 3805, 4149, 2178,
-     2181,  881, 3763, 2184, 2194, 4149, 4149, 2202, 2207, 2218,
-     2221, 4149, 2230, 2244,  538,  172,  874,  268,  678,  408,
-      459,  485, 3769, 2247, 3760, 3767, 3766, 3757, 3745, 3763,
-     3760, 4149, 4149, 2250, 2254, 2266, 4149, 4149, 3757, 3760,
-     3755, 4149, 4149, 2274, 2277, 2290, 3745, 3745, 3756, 2293,
-     2296, 4149, 4149, 2310, 2313, 2321, 4149,  390,  491,  762,
-      548,  734,  510,  551,  892, 1015, 3742, 2326, 3749, 3740,
-
-     3744, 3642, 2329, 3651, 3641, 2332, 4149, 4149, 3627, 2345,
-     3632, 2348, 4149, 4149, 2356, 3613, 3626, 3613, 2361, 2369,
-     4149, 4149,  719, 2378,  600,  224,  602,  794,  816,  539,
-     2381, 3620, 2384, 2387, 3617, 3598, 2390, 2406, 2409, 3608,
-      275, 3590, 3597, 2417, 2422, 3573, 2433, 2439, 2442, 3573,
-     2445,  813, 2450,  811,  622, 1016, 1064, 1084, 2458, 2467,
-     2484, 3570, 2495, 2462, 3565, 2470, 2501, 2505, 4149, 4149,
-     3568, 3567, 3562, 3393, 2513, 2516, 4149, 4149, 2524, 2529,
-     2535, 2540, 3371, 2551, 2554, 3370, 2562, 2567, 1126,  699,
-      663,  873, 1093,  819, 2570, 2573, 2577, 2594, 2625, 2662,
-
-     3381, 2602, 3380, 2590, 3376, 3383, 3372, 3364, 2619, 2607,
-     2643, 2646, 2682, 4149, 2685, 4149, 4149, 3371, 2699, 4149,
-     4149, 3370, 2615, 2693, 1063,  902, 1158, 1076,  991, 1085,
-     2710, 1185, 2713, 2716,  607,   41, 2743, 2780, 3363, 2772,
-     3349, 3358, 3299, 3213, 3211, 2733, 4149, 4149, 2761,  535,
-     1011, 3161, 3150, 2800, 4149, 1091, 1276, 2803,  743, 1082,
-     2806, 1177, 1168, 2809, 1250,  439, 3154,  493, 3083, 2826,
-     3010, 2829, 3002, 2832, 2835, 2851, 2854, 3006, 2964, 2948,
-     2939, 2916, 2871, 2857, 1013, 2860, 1190, 1220, 2863, 1272,
-     1188, 1296, 2891, 2857, 2817, 2870, 2773, 2881, 2710, 2888,
-
-     2898, 2906, 2912, 2922, 2925, 2666, 2933, 2938, 2622, 2633,
-     2601, 2475, 2384, 2367, 2949,  697, 1317, 1214,  908, 1333,
-     1369, 1217, 1362, 2358, 2304, 2952, 2274, 2955, 4149, 4149,
-     2969, 4149, 4149, 2977, 4149, 4149, 2264, 2985, 4149, 4149,
-     2273, 2185, 2140, 2068, 2046, 2045, 1434, 2993, 1364, 1376,
-     1383, 1495, 1241, 1517, 1530, 4149, 2044, 2998, 2002, 1971,
-     1920, 1906, 1899, 1851, 1762, 1640, 1545, 3001, 1543, 1269,
-     1154, 1569,  921, 1557, 1405, 2769, 3010, 3018, 1529, 1549,
-     1483, 1455, 1363, 1250, 1247, 1587, 1298, 1307, 1471, 3021,
-     1077, 1491, 3027, 1267, 1327, 3030, 3033, 3038, 3045, 1264,
-
-     1161, 1141, 1104, 1062, 1007, 1601, 1325, 1589, 1655, 3050,
-     1403, 1661, 3054, 3062, 3067, 3071, 4149, 3074, 3084,  984,
-     4149,  819, 4149,  616,  614, 1706, 1636, 1639, 3092, 1518,
-     1582, 3095, 1710, 1735, 3098, 3102, 3115, 4149, 4149, 4149,
-     4149,  574,  526, 3123, 1441, 1489, 3126, 1734, 1741, 3134,
-     1746, 1766, 1695, 1793, 1852,  503,  458, 3144, 1812, 1834,
-     1879, 1935, 1724, 1693, 1984, 2024, 1765, 1792, 1784, 1865,
-     1937,  465,  409, 2025, 2084, 1606, 1659, 1989, 2013, 1715,
-     1804, 2036, 2096, 1787, 1854, 1909, 1882, 2121,  359,  287,
-     2132, 2156, 1604, 1931, 2171, 2183, 1993, 2101, 2189, 2200,
-
-     2151, 2210, 2004, 1858, 2107,  201,  181, 2218, 2246,  760,
-      821, 2222, 2241, 3152, 1690, 2243, 2266, 1979, 2224, 2327,
-     2300, 2377, 3155, 3161, 2322, 2324, 2264, 2335, 2396, 2421,
-     3165, 3173, 2440, 2449, 2272, 2352, 3177, 2270, 2379, 3182,
-     3194, 3185, 3202, 2460, 2473, 1982, 2398, 2382, 2474, 2159,
-     2494, 3210, 2511, 2517, 1040, 1218, 3213, 2533, 2566, 3221,
-     4149, 4149, 3230, 4149, 4149, 2589, 2633, 2385, 2388, 2641,
-     2655, 2482, 2541, 1751, 2657, 2658, 2560, 2596, 2636, 2654,
-     1911, 2712, 2675, 2691, 2097, 2720, 2715, 2782, 2714, 2723,
-     2461, 2783, 2804, 2432, 2488, 2822, 2828, 2640, 2735, 2830,
-
-     2832, 3238, 2852, 2861, 2807, 2851, 2399, 2869, 2880, 2888,
-     2901, 2736, 2894, 2505, 2530, 2927, 2942, 3242, 4149, 2709,
-     2928, 2859, 2915, 2285, 3025, 3066, 2583, 2805, 2930, 2948,
-     2975, 3037, 3085, 3094, 3091, 3097, 2959, 2988, 2980, 3131,
-     3148, 3245, 3174, 3176, 2750, 3009, 3208, 3211, 3116, 3192,
-     2914, 2997, 3255, 3203, 3243, 3262, 4149, 3143, 3220, 3265,
-     3256, 3263, 3273, 3096, 3260, 3283, 3291, 3202, 3261, 3294,
-     4149, 3300, 3303, 4149, 3266, 3272, 3264, 3270, 3313, 4149,
-     3311, 3312, 3330, 4149, 3281, 3282, 3293, 3295, 3301, 3307,
-     3310, 3317, 3026, 3127, 3306, 3309, 3336, 3327, 3323, 3326,
-
-     3319, 3322, 3353, 3328, 3329, 3344, 3351, 3370, 4149, 3347,
-     3350, 3373, 3360, 3361, 3378, 4149, 3374, 3375, 3365, 3366,
-     3369, 3376, 3377, 3380, 3393, 3394, 3402, 3411, 4149, 4149,
-     3433, 3440, 3447, 3454, 3461, 3468, 3475, 3482, 3489, 3496,
-     3503, 3510, 3517, 3524, 3531, 3538, 3545, 3552, 3559, 3566,
-     3573, 3580, 3587, 3594, 3599, 3604, 3609, 3614, 3619, 3624,
-     3629, 3634, 3639, 3646, 3649, 3652, 3655, 3658, 3661, 3664,
-     3667, 3670, 3673, 3680, 3684, 3690, 3696, 3702, 3708, 3714,
-     3720, 3726, 3732, 3738, 3745, 3752, 3759, 3766, 3773, 3780,
-     3787
-
+       99,  159,   73,   76,  117,  122,  125,  128,  177,  182,
+      185,  188,  204,  207,  210,  213,  228,  231,  234,  237,
+      252,  255,  258,  261,  276,  279,  282,  285,  300,  303,
+      306,  309,  324,  327,  330,  333,  348,  351,  354,  357,
+      373,  418,  391,  396,  399,  436,  463,  520,  441,  444,
+      481,  486,  489,  492,  538,  543,  546,  549,  577,  637,
+      595,  600,  603,  606,  697,  745,  655,  660,  663,  666,
+      793,  850,  715,  720,  723,  726,  763,  768,  771,  774,
+
+      811,  816,  907,  964,  819,  822,  868,  873,  876,  879,
+      925,  930,  933,  936, 1021, 1069,  982,  987,  990,  993,
+     1117, 1174, 1039, 1044, 1047, 1050, 1087, 1092, 1095, 1098,
+     1135, 1140, 1231, 1291, 1143, 1192, 1214, 1250, 4284, 4285,
+     4285,   91,  143,   47,   62, 4285,  146,   77, 4285, 4285,
+     4273, 4285, 4285, 4264, 4285, 4277, 4277, 1160, 4285, 4285,
+     4285, 4285, 4275, 4275, 4239,  343, 4285,  149, 4258,    0,
+       79, 4285, 4231, 4285,  152, 1265,  612,  672, 1153,  223,
+     1270, 1306,  138, 1208,  247, 1260,  499,  607,  494, 4285,
+      402, 4256,    0,  271, 4285, 4225, 4285,  447,  551, 4285,
+
+      625, 4254,    0,  295, 4285, 4211,    7, 4230, 4216, 4210,
+     4285,  630, 1262,  667,  668, 4285,  686, 4249,    0,  319,
+     4285, 4223, 4225, 4285,  690,  828, 4285,  842, 4246,    0,
+      493, 4285, 4220, 4285,  899,  885, 4285,  954, 4244,    0,
+      556, 4285, 4221, 4217, 4219,   76, 4285,  957, 1268,  999,
+     4285, 1011, 4240,    0,  616, 4285, 4200, 4205, 4199, 4285,
+     1146, 1318,  823, 1266, 4285, 1166, 4236,    0,  676, 4285,
+     4210, 4285, 1195, 1271, 4285, 1222, 4234,    0,  880, 4285,
+     4192, 4197, 4201, 4190, 4285, 1253, 1326, 1327, 1322, 1330,
+     4285, 1257, 4229,    0,  943, 4285, 4206, 4285, 1340, 1328,
+
+     4240, 4206, 1350,   34, 4181, 4285, 4232, 4223, 4285, 4285,
+     4285,   26,   36, 4182, 4181, 4179, 4219, 4186, 4285,    0,
+     4179, 4180, 4180, 4180, 4183, 4174, 4176, 4175, 4174, 4285,
+        0, 4176, 4177, 4285,    0, 4184, 1355, 4165, 4160, 4160,
+     4180, 4172, 4162, 4285,    0, 1361, 4167, 4162, 4285,    0,
+     1371, 4159, 4285,    0, 4162, 1380, 4155, 4172, 4171, 4160,
+     4285,    0, 4151, 4154, 4165, 4150, 4157, 4285,    0, 1383,
+     4154, 4285,    0, 4151, 4145, 4151, 4160, 4145, 4142, 4285,
+        0, 4147, 4156, 4158, 4176, 4175, 4182,  104, 4140, 4285,
+      127,    0, 4136, 4136, 4173, 4172, 4133, 4285, 4145, 4127,
+
+     1387, 1390, 4126, 4140, 4129, 4127, 4120, 4119, 4118, 4132,
+     1399, 1407, 4127, 1410, 1417, 4130, 4134, 4128, 4113, 1426,
+     1429, 4117, 1432, 1439, 4110, 1435, 1448, 1452, 1458, 1468,
+     1471, 4125, 1474, 1481, 4123, 4110, 4107, 1477, 1490, 1494,
+     4124, 1497, 1503, 1513, 4111, 1516, 1523, 1532, 1537, 4120,
+     4103, 4110, 4103, 1540, 1543, 4112, 4098, 1549, 1560, 4134,
+     4285, 4137, 4285, 4285,  177, 4104, 4285, 4138, 4137, 4094,
+     4285, 4285, 4092, 4091, 4100, 1566, 1569, 4285, 1572, 4089,
+     4096, 4096, 4102, 4085, 4084, 4083, 1577, 1589, 1593, 4285,
+     1599, 4090, 1616, 4285, 4285, 4083, 4085, 4081, 4092, 1606,
+
+     1611, 4285, 1624, 4081, 1628, 4285, 4285, 4090, 1636, 1641,
+     4285, 1644, 1647, 4285, 4285, 1661, 1664, 4285, 1667, 4072,
+     1671, 4285, 4285, 4080, 4083, 4086, 1684, 1687, 4285, 1690,
+     1696, 1708, 4087, 1716, 1719, 1727, 1732, 4285, 1735, 4079,
+     1745, 4285, 4285, 1753, 1756, 4285, 1759, 4069, 1762, 4087,
+     4067, 1765, 1778, 4285, 1782, 4065, 4079, 1785, 1788, 4285,
+     1795, 4099,  165, 1805, 4285, 4285, 4106, 4105, 4074, 4065,
+     1812, 1602, 4058, 1815, 4072, 4071, 4070, 4069, 1823, 1830,
+     1840, 4072, 4066, 4051, 1843, 1846, 1849, 1818, 1852, 1862,
+     1869, 4061, 4066, 4055, 1872, 1875, 1892, 4285, 4285, 4048,
+
+     1900, 4285, 4285, 1879, 4091, 1910, 4056, 1915, 1927, 4045,
+     4063, 1936, 4050, 1918, 1939, 4080,  185, 4081, 1942, 4285,
+     4080, 4285, 4285, 4044, 4044, 1945, 1948, 4052, 1962, 4037,
+     1965, 1968, 4037, 1971, 4285, 4285, 1979, 4051, 4047, 4032,
+     1989, 2001, 1992, 2009, 4044, 2021, 1985, 1997, 2024, 2032,
+     2038, 4045, 4024, 4040, 2041, 2045, 4040, 2057, 4045, 2060,
+     4041, 2063, 4029, 2067, 4285, 4285, 4033, 4022, 2081, 4035,
+     2084, 2087, 2103, 4043,  987,  121,  204, 4285, 4021, 2106,
+     2109, 4032, 4018, 2112, 2115, 2126, 4026, 4017, 4026, 2129,
+     4285, 4285, 2137, 4040, 4039, 4021, 2145, 4285, 2149, 4285,
+
+     4285, 2157, 4285, 2162, 4010, 2168, 4028, 2175, 4035, 4034,
+     4016, 2184, 4285, 4010, 2187, 4004, 2190, 4009, 4009, 4011,
+     2193, 4006, 2197, 4285, 4285, 2210, 4037,   67,  140,  187,
+     4005, 2213, 2217, 2231, 2234, 2237, 2240, 2244, 4005, 4010,
+     4000,  221,  242, 4002, 2249, 4004, 2253, 2257, 4005, 3995,
+      266,  269, 3998, 3995, 2271, 4285, 3994, 2274, 2277, 4001,
+     3993, 2280, 3985, 2293, 4005, 2297,  424,  351, 4002, 2300,
+     4285, 4285, 2310, 2314, 2317, 2320, 3992, 3987, 3990, 4012,
+     4030, 4010, 4025, 3989, 2323, 4285, 2327, 2344, 4285, 4285,
+     3984, 3978, 4005, 3913, 3893, 3899, 3861, 3863, 2331, 2352,
+
+     2355, 2365, 2360, 3855, 2376, 2379, 2382, 4285, 2439,  184,
+      227, 3853, 2385, 2388, 4285, 3835, 3848, 3835, 3878, 4285,
+     3872, 4285, 2393, 2405, 2409, 3833, 3821, 3816, 3855, 4285,
+     3847, 4285, 2417, 1114, 2423, 2426, 2429, 4285, 4285, 2443,
+     2446, 2459, 2462, 4285, 2465, 2470,  353,  491,  435,  275,
+      516,  583,  297,  715, 3807, 2479, 3783, 3797, 3790, 4285,
+     4285, 2488, 2497, 2505, 4285, 4285, 3783, 3782, 3577, 4285,
+     4285, 2513, 2517, 3567, 3567, 2525, 4285, 2529, 4285, 4285,
+     2537, 2542, 2553, 4285,  326,  573,  207,  878,  299,  763,
+      395,  935,  936, 3565, 2556, 2559, 3580, 3578, 2563, 4285,
+
+     4285, 3566, 2575, 3572, 2578, 4285, 4285, 3555, 3561, 2587,
+     4285, 4285,  399,  329,  633,  347,  555, 1002,  722,  497,
+     2599, 3559, 2602, 2605, 2609, 3493,  264, 3480, 3486, 2621,
+     2624, 3430, 2632, 2637,  468, 2640,  678, 2643,  323,  725,
+     2648,  741, 2660, 2665, 2682, 3263, 2671, 2690, 4285, 4285,
+     3245, 3239, 3236, 3212, 2699, 2702, 4285, 4285, 2715, 2718,
+     2721, 3180, 2734, 2737, 3124,  773, 2745,  398, 2750,  300,
+      811,  960, 2753, 2677, 2756, 2763, 2774, 2792, 2830, 3129,
+     2787, 3092, 3092, 3074, 3065, 2810, 2813, 2848, 2851, 2860,
+     4285, 4285, 3073, 2868, 4285, 4285, 3057, 1211,  396,  830,
+
+      582, 1046,  875, 1074,  771, 2822, 2876, 2879,   17,  498,
+     2897, 2935, 3017, 2915, 3024, 2969, 2955, 2863, 2887, 4285,
+     4285, 2918,  542,  707, 2834, 2829, 1047,  887, 2927,  929,
+     1287,  660, 2953,  982, 1343, 2956,  831,  443, 2852,  933,
+     2794, 2962, 2744, 2965, 2974, 2982, 2985, 2990, 2730, 2702,
+     2694, 2645, 2601, 2590, 2993, 1027, 3002, 1075, 3010, 1122,
+     3013, 1170, 1049, 1359, 2608, 2576, 2540, 3019, 2465, 3023,
+     3031, 3036, 3047, 3050, 3058, 3063, 2349, 3074, 3080, 2367,
+     2379, 2307, 2319, 2252, 2251, 3090,  200, 1380,  720, 3093,
+      992, 1386,  768, 1210, 1337, 2267, 2123, 3096, 3100, 4285,
+
+     4285, 3113, 4285, 4285, 3126, 4285, 4285, 2130, 3134, 4285,
+     4285, 2090, 2067, 2062, 2041, 1984, 1955, 1388, 1039, 1381,
+     1123, 1492, 1332, 1531, 1378, 1091, 1428, 4285, 1904, 3143,
+     1913, 1882, 1881, 1863, 1833, 1746, 1600, 1564, 3146, 1495,
+     3149, 1618, 1145, 1519, 3152, 1439, 1485, 3006, 3155, 1528,
+     1490, 1479, 1433, 1325, 1239, 1157, 1542, 3172, 1565, 3180,
+     1637, 1470, 1660, 3191, 3199, 1530, 3202, 3208, 3211, 1092,
+     1107, 1037,  934,  842,  795, 1677, 1603, 1639, 1686, 1689,
+     1755, 1685, 1605, 1698, 1811, 1843, 3216, 3227, 3233, 4285,
+     3236, 3240,  830, 4285,  779, 4285,  568,  567, 1714, 1094,
+
+     1142, 3252, 1155, 1617, 1723, 1538, 3255, 1665, 1866, 1905,
+     1998, 3258, 3275, 4285, 4285, 4285, 4285,  581,  530, 3283,
+     1688, 1722, 3286, 1754, 1775, 3294, 1783, 3304, 1870, 1897,
+     1958, 1961, 2011, 2035,  507,  454, 3312, 1757, 1841, 2077,
+     2079, 1916, 1940, 3322, 1400, 2080, 2085, 2001, 2034, 1966,
+     2127, 2013, 2108,  415,  322, 2207, 2211, 2062, 2209, 2139,
+     2150, 2287, 2289, 2251, 2318, 1844, 2186, 2206, 2355, 2375,
+     2213, 2433, 2254, 2342,  311,  231, 2418, 2435, 1318, 1582,
+     2358, 2383, 1777, 1787, 2453, 2466, 1198, 2398, 2440, 2405,
+     2467, 2480, 2506, 2457, 2492,  226,   53, 2529, 2532, 2132,
+
+     2486, 2552, 2565, 2581, 2603, 2576, 2642, 1505, 2611, 2652,
+     2637, 2692, 2535, 2694, 2557, 2647, 3330, 3333, 2689, 2743,
+     2275, 2764, 2708, 2744, 2810, 2914, 2841, 2866, 3339, 2908,
+     2982, 2964, 3062, 2768, 2823, 2713, 2857, 3342, 3349, 3358,
+     3361, 3012, 3025, 2014, 2322, 2877, 2928, 2672, 2905, 3028,
+     3039, 3369, 3037, 3061, 3067, 3123, 3102, 3107, 2826, 3089,
+     3374, 4285, 4285, 3382, 4285, 4285, 3170, 3173, 2943, 3000,
+     3113, 3115, 3150, 3169, 3181, 3215, 2084, 3142, 3198, 3205,
+     3247, 3229, 3232, 3151, 3161, 3250, 3253, 3251, 3256, 3291,
+     3309, 3305, 3311, 3299, 3348, 2710, 3363, 3371, 3350, 3351,
+
+     3321, 3338, 3372, 3374, 3384, 3386,  888,  990, 3381, 3382,
+     2204, 1890, 3390, 3394, 2138, 3388, 3389, 2546, 2334, 3391,
+     3392, 3393, 3395, 3396, 3398, 3418, 3400, 3401, 3424, 3405,
+     3411, 1752, 3412, 3415, 3442, 3431, 3162, 3420, 3422, 3425,
+     3429, 3453, 4285, 3432, 3434, 3464, 4285, 3443, 3444, 2441,
+     3446, 3451, 3477, 4285, 3482, 3470, 3273, 3454, 3456, 3472,
+     3487, 3473, 3474, 3504, 3492, 3494, 3511, 4285, 3516, 3503,
+     3514, 3522, 3521, 3519, 3539, 3547, 3550, 4285, 3556, 3559,
+     4285, 3567, 2516, 2892, 3576, 4285, 3579, 4285, 3584, 4285,
+     2802, 2944, 2767, 3014, 3293, 3486, 3493, 3528, 3515, 3538,
+
+     3517, 3526, 3573, 3581, 3529, 3555, 3546, 3557, 3575, 3577,
+     3590, 3591, 3603, 3608, 4285, 4285, 3626, 3633, 3640, 3647,
+     3654, 3661, 3668, 3675, 3682, 3689, 3696, 3703, 3710, 3717,
+     3724, 3731, 3738, 3745, 3752, 3759, 3766, 3773, 3780, 3787,
+     3794, 3801, 3808, 3815, 3820, 3825, 3830, 3835, 3840, 3845,
+     3850, 3855, 3860, 3865, 3872, 3875, 3878, 3881, 3884, 3887,
+     3890, 3893, 3896, 3899, 3902, 3909, 3913, 3919, 3925, 3931,
+     3937, 3943, 3949, 3955, 3961, 3967, 3973, 3980, 3987, 3994,
+     4001, 4008, 4015, 4022
     } ;
 
-static yyconst flex_int16_t yy_def[1592] =
+static yyconst flex_int16_t yy_def[1585] =
     {   0,
-     1531, 1531, 1532, 1532, 1532, 1532, 1533, 1533, 1534, 1534,
-     1535, 1535, 1536, 1536, 1536, 1536, 1537, 1537, 1531, 1531,
-     1538, 1538, 1539, 1539, 1539, 1539, 1531, 1531, 1539, 1539,
-     1531, 1531, 1539, 1539, 1539, 1539, 1531, 1531, 1540, 1540,
-     1541, 1541, 1531, 1531, 1530,   45, 1542, 1542, 1531, 1531,
-     1543, 1543, 1544, 1544, 1531, 1531, 1545, 1545, 1546, 1546,
-     1531, 1531, 1547, 1547, 1548, 1548, 1531, 1531, 1548, 1548,
-     1548, 1548, 1531, 1531, 1549, 1549, 1550, 1550, 1531, 1531,
-     1551, 1551, 1552, 1552, 1531, 1531, 1552, 1552, 1552, 1552,
-     1531, 1531, 1553, 1553, 1554, 1554, 1536, 1536, 1530, 1530,
-
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1555,
-     1530, 1530, 1555, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1556, 1530, 1530, 1556, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1557, 1530, 1530, 1557, 1557,
-     1557, 1557, 1557, 1557, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1558, 1530, 1530, 1558, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1559, 1530, 1530, 1559, 1559, 1559, 1559, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1560, 1530, 1530, 1560,
-
-     1560, 1560, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1561, 1530, 1530, 1561, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1562, 1530, 1530, 1562, 1562, 1562, 1562, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1563, 1530,
-     1530, 1563, 1530, 1530, 1530, 1530, 1530, 1530, 1564, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1555, 1555, 1565, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1556, 1556, 1566, 1530, 1557, 1557, 1557, 1557, 1557,
-     1557, 1557, 1567, 1530, 1530, 1558, 1558, 1568, 1530, 1559,
-
-     1559, 1559, 1559, 1559, 1559, 1569, 1530, 1530, 1560, 1560,
-     1560, 1560, 1570, 1530, 1530, 1530, 1561, 1561, 1571, 1530,
-     1530, 1562, 1562, 1562, 1562, 1562, 1572, 1530, 1530, 1563,
-     1563, 1573, 1530, 1530, 1574, 1530, 1574, 1530, 1530, 1530,
-     1575, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1555, 1576,
-     1576, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1556, 1577, 1577, 1557, 1557,
-     1557, 1557, 1557, 1557, 1578, 1578, 1530, 1558, 1579, 1579,
-     1559, 1559, 1559, 1559, 1559, 1580, 1580, 1530, 1560, 1560,
-     1560, 1581, 1581, 1530, 1530, 1561, 1582, 1582, 1562, 1562,
-
-     1562, 1562, 1583, 1583, 1530, 1563, 1584, 1584, 1530, 1530,
-     1574, 1530, 1530, 1574, 1530, 1530, 1575, 1530, 1530, 1530,
-     1530, 1530, 1530, 1555, 1530, 1576, 1530, 1576, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1556, 1530, 1577, 1530, 1577, 1557, 1557, 1557,
-     1557, 1557, 1557, 1530, 1578, 1530, 1578, 1530, 1558, 1530,
-     1579, 1530, 1579, 1559, 1559, 1559, 1559, 1559, 1530, 1580,
-     1530, 1580, 1530, 1530, 1530, 1560, 1530, 1530, 1530, 1581,
-     1530, 1581, 1530, 1530, 1561, 1530, 1582, 1530, 1582, 1562,
-     1562, 1562, 1562, 1530, 1583, 1530, 1583, 1530, 1563, 1530,
-
-     1584, 1530, 1584, 1530, 1574, 1585, 1530, 1530, 1530, 1530,
-     1530, 1555, 1576, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1577,
-     1557, 1557, 1557, 1530, 1530, 1557, 1557, 1578, 1530, 1530,
-     1530, 1579, 1559, 1559, 1530, 1530, 1559, 1559, 1580, 1530,
-     1530, 1530, 1530, 1560, 1530, 1530, 1530, 1581, 1530, 1530,
-     1530, 1530, 1582, 1562, 1530, 1530, 1562, 1562, 1583, 1530,
-     1563, 1584, 1530, 1574, 1585, 1585, 1530, 1585, 1530, 1530,
-     1530, 1555, 1576, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1577, 1557,
-
-     1557, 1557, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1557,
-     1530, 1530, 1530, 1530, 1530, 1530, 1579, 1559, 1559, 1530,
-     1530, 1530, 1559, 1530, 1530, 1559, 1580, 1530, 1560, 1581,
-     1530, 1530, 1530, 1530, 1530, 1582, 1562, 1530, 1530, 1530,
-     1562, 1562, 1583, 1530, 1530, 1530, 1584, 1530, 1574, 1585,
-     1585, 1530, 1530, 1555, 1576, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1577, 1557,
-     1557, 1557, 1530, 1530, 1530, 1530, 1530, 1530, 1557, 1579,
-     1559, 1559, 1559, 1530, 1530, 1530, 1559, 1580, 1560, 1581,
-     1530, 1582, 1562, 1562, 1562, 1583, 1530, 1530, 1530, 1530,
-
-     1584, 1530, 1574, 1585, 1585, 1530, 1530, 1530, 1576, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1577, 1557, 1557, 1557, 1530, 1530, 1557, 1579, 1559, 1530,
-     1530, 1559, 1559, 1530, 1530, 1559, 1580, 1560, 1530, 1530,
-     1530, 1582, 1562, 1562, 1562, 1583, 1530, 1584, 1530, 1574,
-     1585, 1585, 1530, 1530, 1530, 1530, 1576, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1577, 1557, 1557, 1557,
-     1530, 1530, 1530, 1530, 1557, 1530, 1530, 1559, 1530, 1530,
-     1530, 1559, 1559, 1530, 1530, 1530, 1530, 1559, 1580, 1560,
-     1530, 1582, 1530, 1530, 1562, 1562, 1583, 1530, 1584, 1530,
-
-     1574, 1585, 1585, 1530, 1576, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1557, 1557, 1557, 1530, 1530, 1530, 1530, 1557,
-     1530, 1530, 1559, 1559, 1559, 1530, 1530, 1530, 1530, 1559,
-     1580, 1560, 1530, 1582, 1530, 1530, 1530, 1530, 1530, 1562,
-     1530, 1530, 1530, 1584, 1574, 1574, 1574, 1574, 1574, 1574,
-     1585, 1585, 1530, 1576, 1530, 1530, 1530, 1530, 1557, 1557,
-     1557, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1559, 1559,
-     1559, 1530, 1530, 1530, 1530, 1580, 1560, 1560, 1530, 1582,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1585, 1585, 1530, 1576, 1530, 1530,
-
-     1530, 1530, 1557, 1557, 1557, 1530, 1530, 1530, 1559, 1559,
-     1559, 1530, 1530, 1530, 1580, 1560, 1560, 1530, 1582, 1530,
-     1530, 1530, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1585,
-     1585, 1530, 1576, 1530, 1530, 1530, 1530, 1530, 1530, 1557,
-     1557, 1557, 1559, 1530, 1530, 1559, 1580, 1560, 1560, 1530,
-     1582, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1585, 1585,
-     1585, 1530, 1576, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1557, 1557, 1557, 1557, 1559, 1530, 1530, 1530, 1559, 1580,
-     1530, 1530, 1560, 1530, 1530, 1560, 1530, 1582, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1585, 1585, 1585, 1586, 1587,
-
-     1530, 1576, 1530, 1530, 1557, 1557, 1557, 1557, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1560, 1530, 1530,
-     1530, 1560, 1530, 1582, 1574, 1574, 1574, 1574, 1574, 1574,
-     1574, 1574, 1574, 1585, 1588, 1589, 1586, 1587, 1530, 1576,
-     1530, 1557, 1557, 1557, 1557, 1530, 1530, 1530, 1530, 1530,
-     1530, 1560, 1560, 1530, 1530, 1574, 1574, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1588, 1585, 1590, 1589, 1591, 1585,
-     1530, 1576, 1530, 1557, 1557, 1557, 1557, 1530, 1530, 1530,
-     1530, 1560, 1560, 1574, 1574, 1574, 1574, 1574, 1574, 1574,
-     1574, 1574, 1590, 1530, 1591, 1585, 1530, 1576, 1530, 1530,
-
-     1530, 1530, 1530, 1530, 1530, 1557, 1530, 1530, 1530, 1530,
-     1530, 1530, 1560, 1560, 1574, 1574, 1574, 1574, 1574, 1574,
-     1574, 1574, 1574, 1530, 1530, 1576, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1557, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1560, 1560, 1574, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1530, 1530, 1576, 1530, 1557,
-     1530, 1530, 1530, 1530, 1560, 1560, 1574, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1530, 1576, 1530, 1557, 1530,
-     1530, 1530, 1530, 1560, 1560, 1574, 1574, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1530, 1576, 1530, 1557, 1530,
-
-     1530, 1530, 1530, 1560, 1560, 1574, 1574, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1560, 1560, 1574, 1574, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1574, 1530, 1530, 1530, 1530,
-     1530, 1560, 1560, 1574, 1574, 1574, 1574, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1560, 1560, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574,
-     1574, 1560, 1560, 1574, 1574, 1574, 1574, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1560, 1560,
-     1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574,
-
-     1574, 1574, 1574, 1574, 1574, 1560, 1560, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574,
-     1574, 1574, 1560, 1560, 1574, 1574, 1574, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1530,
-     1530, 1530, 1530, 1574, 1574, 1574, 1574, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1530,
-     1530, 1530, 1530, 1530, 1530, 1574, 1574, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574,
-
-     1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1530, 1574,
-     1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1574, 1530, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574,
-     1530, 1574, 1574, 1530, 1574, 1574, 1574, 1574, 1574, 1530,
-     1574, 1574, 1574, 1530, 1574, 1574, 1574, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574,
-
-     1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1530, 1574,
-     1574, 1574, 1574, 1574, 1574, 1530, 1574, 1574, 1574, 1574,
-     1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1530,    0,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530
-
+     1517, 1517, 1518, 1518, 1518, 1518, 1519, 1519, 1520, 1520,
+     1521, 1521, 1522, 1522, 1522, 1522, 1523, 1523, 1517, 1517,
+     1524, 1524, 1525, 1525, 1517, 1517, 1525, 1525, 1525, 1525,
+     1517, 1517, 1525, 1525, 1525, 1525, 1517, 1517, 1525, 1525,
+     1525, 1525, 1517, 1517, 1525, 1525, 1525, 1525, 1517, 1517,
+     1525, 1525, 1517, 1517, 1525, 1525, 1525, 1525, 1517, 1517,
+     1526, 1526, 1527, 1527, 1517, 1517, 1528, 1528, 1529, 1529,
+     1517, 1517, 1529, 1529, 1529, 1529, 1517, 1517, 1530, 1530,
+     1531, 1531, 1517, 1517, 1532, 1532, 1533, 1533, 1517, 1517,
+     1534, 1534, 1535, 1535, 1517, 1517, 1535, 1535, 1535, 1535,
+
+     1517, 1517, 1536, 1536, 1537, 1537, 1517, 1517, 1537, 1537,
+     1537, 1537, 1517, 1517, 1538, 1538, 1539, 1539, 1517, 1517,
+     1540, 1540, 1541, 1541, 1517, 1517, 1541, 1541, 1541, 1541,
+     1517, 1517, 1542, 1542, 1543, 1543, 1544, 1544, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1545,
+     1516, 1516, 1545, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1546, 1516, 1516, 1546, 1516, 1516, 1516, 1516,
+
+     1516, 1516, 1547, 1516, 1516, 1547, 1547, 1547, 1547, 1547,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1548, 1516,
+     1516, 1548, 1548, 1516, 1516, 1516, 1516, 1516, 1516, 1549,
+     1516, 1516, 1549, 1516, 1516, 1516, 1516, 1516, 1516, 1550,
+     1516, 1516, 1550, 1550, 1550, 1550, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1551, 1516, 1516, 1551, 1551, 1551, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1552, 1516, 1516,
+     1552, 1516, 1516, 1516, 1516, 1516, 1516, 1553, 1516, 1516,
+     1553, 1553, 1553, 1553, 1516, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1554, 1516, 1516, 1554, 1516, 1516, 1516,
+
+     1516, 1516, 1516, 1555, 1516, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1545,
+     1545, 1556, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+     1546, 1546, 1557, 1516, 1547, 1547, 1547, 1547, 1547, 1547,
+     1547, 1558, 1516, 1516, 1548, 1548, 1548, 1559, 1516, 1549,
+     1549, 1560, 1516, 1550, 1550, 1550, 1550, 1550, 1550, 1561,
+     1516, 1551, 1551, 1551, 1551, 1562, 1516, 1516, 1552, 1552,
+     1563, 1516, 1553, 1553, 1553, 1553, 1553, 1564, 1516, 1516,
+     1554, 1554, 1565, 1516, 1516, 1566, 1516, 1566, 1516, 1516,
+     1516, 1567, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1545,
+
+     1568, 1568, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1546,
+     1569, 1569, 1547, 1516, 1516, 1547, 1547, 1547, 1547, 1570,
+     1570, 1516, 1516, 1516, 1548, 1571, 1571, 1516, 1516, 1572,
+     1572, 1550, 1516, 1516, 1550, 1550, 1550, 1573, 1573, 1551,
+     1551, 1551, 1574, 1574, 1516, 1516, 1516, 1575, 1575, 1553,
+     1553, 1553, 1553, 1576, 1576, 1516, 1554, 1577, 1577, 1516,
+     1516, 1566, 1516, 1516, 1566, 1516, 1516, 1567, 1516, 1516,
+     1516, 1516, 1516, 1516, 1545, 1516, 1568, 1516, 1568, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1546, 1516, 1569, 1516,
+     1569, 1547, 1516, 1516, 1516, 1547, 1547, 1547, 1547, 1516,
+
+     1570, 1516, 1570, 1516, 1516, 1516, 1516, 1548, 1516, 1571,
+     1516, 1571, 1516, 1516, 1516, 1516, 1572, 1516, 1572, 1550,
+     1516, 1516, 1516, 1550, 1550, 1550, 1516, 1573, 1516, 1573,
+     1516, 1516, 1551, 1516, 1516, 1516, 1574, 1516, 1574, 1516,
+     1516, 1516, 1516, 1516, 1575, 1516, 1575, 1553, 1553, 1553,
+     1553, 1516, 1576, 1516, 1576, 1516, 1554, 1516, 1577, 1516,
+     1577, 1516, 1566, 1578, 1516, 1516, 1516, 1516, 1516, 1545,
+     1568, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+     1569, 1547, 1547, 1547, 1547, 1547, 1570, 1516, 1548, 1571,
+     1572, 1550, 1550, 1550, 1550, 1573, 1516, 1516, 1516, 1551,
+
+     1516, 1516, 1516, 1574, 1516, 1575, 1553, 1516, 1516, 1553,
+     1553, 1576, 1516, 1554, 1577, 1516, 1566, 1578, 1578, 1516,
+     1578, 1516, 1516, 1516, 1545, 1568, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1569, 1547, 1547, 1547,
+     1516, 1516, 1516, 1516, 1547, 1570, 1516, 1516, 1516, 1571,
+     1572, 1550, 1550, 1550, 1516, 1516, 1550, 1573, 1551, 1574,
+     1516, 1575, 1553, 1516, 1516, 1516, 1553, 1553, 1576, 1516,
+     1516, 1516, 1577, 1516, 1566, 1578, 1578, 1516, 1516, 1545,
+     1568, 1516, 1516, 1516, 1516, 1569, 1547, 1547, 1547, 1516,
+     1516, 1516, 1516, 1516, 1516, 1547, 1516, 1516, 1516, 1516,
+
+     1516, 1516, 1516, 1572, 1550, 1550, 1550, 1516, 1516, 1516,
+     1550, 1516, 1516, 1551, 1574, 1516, 1575, 1553, 1553, 1553,
+     1576, 1516, 1516, 1516, 1516, 1577, 1516, 1566, 1578, 1578,
+     1516, 1516, 1516, 1568, 1516, 1516, 1516, 1569, 1547, 1547,
+     1547, 1516, 1516, 1547, 1572, 1550, 1516, 1516, 1550, 1550,
+     1516, 1516, 1550, 1551, 1516, 1516, 1516, 1575, 1553, 1553,
+     1553, 1576, 1516, 1577, 1516, 1566, 1578, 1578, 1516, 1516,
+     1516, 1516, 1568, 1516, 1516, 1569, 1547, 1547, 1547, 1516,
+     1516, 1516, 1516, 1547, 1516, 1516, 1550, 1516, 1516, 1516,
+     1550, 1550, 1516, 1516, 1516, 1516, 1550, 1551, 1516, 1575,
+
+     1516, 1516, 1553, 1553, 1576, 1516, 1577, 1516, 1566, 1578,
+     1578, 1516, 1568, 1516, 1516, 1547, 1547, 1547, 1516, 1516,
+     1516, 1516, 1547, 1516, 1516, 1550, 1550, 1550, 1516, 1516,
+     1516, 1516, 1550, 1551, 1516, 1575, 1516, 1516, 1516, 1516,
+     1516, 1553, 1516, 1516, 1516, 1577, 1566, 1566, 1566, 1566,
+     1566, 1566, 1578, 1578, 1516, 1568, 1547, 1547, 1547, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1550, 1550, 1550, 1516,
+     1516, 1516, 1516, 1551, 1551, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1566, 1566, 1566, 1566, 1566, 1566,
+     1566, 1578, 1578, 1516, 1568, 1547, 1547, 1547, 1516, 1516,
+
+     1516, 1550, 1550, 1550, 1516, 1516, 1516, 1551, 1551, 1516,
+     1516, 1516, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1578,
+     1578, 1516, 1568, 1516, 1516, 1547, 1547, 1547, 1550, 1516,
+     1516, 1550, 1551, 1551, 1566, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1578, 1578, 1578, 1516, 1568, 1516, 1516, 1516,
+     1547, 1547, 1547, 1547, 1550, 1516, 1516, 1516, 1550, 1516,
+     1516, 1551, 1516, 1516, 1551, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1578, 1578, 1578, 1579, 1580, 1516,
+     1568, 1547, 1547, 1547, 1547, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1551, 1516, 1516, 1516, 1551, 1566, 1566, 1566,
+
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1578, 1581, 1582,
+     1579, 1580, 1516, 1568, 1547, 1547, 1547, 1547, 1516, 1516,
+     1516, 1516, 1516, 1516, 1551, 1551, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1581, 1578, 1583, 1582,
+     1584, 1578, 1516, 1568, 1547, 1547, 1547, 1547, 1516, 1516,
+     1516, 1516, 1551, 1551, 1566, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1583, 1516, 1584, 1578, 1516, 1568,
+     1516, 1516, 1516, 1516, 1516, 1516, 1547, 1516, 1516, 1516,
+     1516, 1516, 1516, 1551, 1551, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1516, 1516, 1568, 1516, 1516,
+
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1547, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1551, 1551, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1516, 1516, 1568,
+     1547, 1516, 1516, 1516, 1516, 1551, 1551, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1516, 1568, 1547,
+     1516, 1516, 1516, 1516, 1551, 1551, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1516, 1568, 1547, 1516,
+     1516, 1516, 1516, 1551, 1551, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1551, 1551, 1566, 1566,
+
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1516, 1516, 1516, 1516, 1516, 1551, 1551, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1551, 1551, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1551, 1551, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1551, 1551, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1551, 1551, 1566, 1566, 1566,
+
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1551, 1551, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1516, 1516, 1516,
+     1516, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566,
+     1516, 1516, 1516, 1516, 1516, 1516, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566,
+
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1516, 1566, 1566, 1566, 1516, 1566, 1566, 1566,
+     1566, 1566, 1566, 1516, 1566, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1516, 1566, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1516, 1566, 1566,
+     1516, 1566, 1566, 1566, 1566, 1516, 1566, 1516, 1566, 1516,
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566,
+
+     1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566,
+     1566, 1566, 1566, 1566, 1516,    0, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516
     } ;
 
-static yyconst flex_int16_t yy_nxt[4212] =
+static yyconst flex_int16_t yy_nxt[4349] =
     {   0,
-     1530,  102,  103,  102,  102,  103,  102,  102,  103,  102,
-      102,  103,  102,  110, 1530,  104,  110,  113,  104,  113,
-      111,  105,  412,  111,  105,  107,  103,  107,  107,  103,
-      107,  116,  117,  114,  414,  114,  118,  119,  340,  108,
-      116,  117,  108,  336,  120,  118,  119,  116,  117, 1066,
-      121,  249,  118,  120,  116,  117,  337,  121, 1069,  118,
-      120,  123,  124,  123,  124,  250,  249,  120,  103,  103,
-      103,  103,  103,  103,  135,  103,  135,  135,  103,  135,
-      251,  342,  126,  356,  343,  126,  341,  577,  136,  357,
-      356,  136,  248,  248,  248,  125,  362,  125,  127,  128,
-
-      103,  128,  127,  127,  127,  127,  127,  127,  127,  129,
-      127,  577,  127,  131,  127,  132,  127,  135,  103,  135,
-      704,  135,  103,  135,  103,  103,  103,  103,  103,  103,
-      340,  137,  416,  127,  127,  137,  252,  304,  138,  412,
-      252,  138,  248,  248,  248,  248,  248,  248,  305,  803,
-      251,  248,  248,  248,  251,  574,  133,  127,  128,  103,
-      128,  127,  127,  127,  127,  127,  127,  127,  129,  127,
-      577,  127,  131,  127,  132,  127,  135,  103,  135,  412,
-      135,  103,  135,  103,  103,  103,  103,  103,  103,  412,
-      136,  412,  127,  127,  136,  505,  649,  139,  577,  852,
-
-      139,  412,  135,  103,  135,  135,  103,  135,  135,  103,
-      135,  135,  103,  135,  703,  133,  137,  771,  252,  137,
-      577,  772,  140,  705,  889,  140,  103,  103,  103,  103,
-      103,  103,  251,  248,  248,  248,  248,  248,  248, 1324,
-      141,  412, 1323,  141,  142,  143,  103,  143,  142,  142,
-      142,  142,  142,  142,  142,  144,  142,  752,  142,  146,
-      142,  147,  142,  150,  103,  150,  263,  150,  103,  150,
-      103,  103,  103,  248,  248,  248,  412,  151,  577,  142,
-      142,  151,  750,  955,  152,  412,  577,  148,  142,  143,
-      103,  143,  142,  142,  142,  142,  142,  142,  142,  144,
-
-      142,  751,  142,  146,  142,  147,  142,  103,  103,  103,
-      891,  166,  103,  166,  166,  103,  166,  248,  248,  248,
-      802,  152,  773,  142,  142,  167,  774, 1307,  167,  972,
-      973,  148,  153,  154,  103,  154,  153,  153,  153,  153,
-      153,  153,  153,  155,  153,  156,  153,  157,  153,  158,
-      153,  156,  156,  156,  156,  156,  156,  156,  156,  156,
-      156,  156,  156,  156,  156,  156,  156,  153,  153,  156,
-      159,  156,  156,  156,  156,  156,  156,  156,  160,  156,
-      156,  161,  162,  156,  163,  156,  156,  164,  156,  156,
-      156,  156,  156,  156,  103,  103,  103,  103,  103,  103,
-
-      248,  248,  248,  248,  248,  248,  784,  412,  168, 1306,
-      785,  168,  169,  170,  103,  170,  169,  169,  169,  169,
-      169,  169,  169,  171,  169,  412,  169,  173,  169,  174,
-      169,  177,  103,  177,  923,  177,  103,  177,  103,  103,
-      103,  103,  103,  103,  252,  178,  252,  169,  169,  178,
-      786, 1290,  179,  284,  787,  179,  577,  578,  251,  894,
-      251,  577,  175,  169,  170,  103,  170,  169,  169,  169,
-      169,  169,  169,  169,  171,  169,  577,  169,  173,  169,
-      174,  169,  191,  103,  191,  851,  191,  103,  191,  103,
-      103,  103,  103,  103,  103,  252,  192,  252,  169,  169,
-
-      192, 1066,  577,  193,  293,  895,  193, 1289,  412,  251,
-     1069,  251, 1273,  175,  180,  181,  103,  181,  180,  180,
-      180,  180,  180,  180,  180,  182,  180,  412,  180,  184,
-      180,  185,  180,  204,  103,  204,  896,  204,  103,  204,
-      103,  103,  103,  103,  103,  103,  252,  205,  924,  180,
-      180,  205,  252,  186,  206,  412,  577,  206, 1272, 1078,
-      251,  928,  187, 1257,  188,  412,  251, 1079,  412,  189,
-      180,  181,  103,  181,  180,  180,  180,  180,  180,  180,
-      180,  182,  180,  959,  180,  184,  180,  185,  180,  204,
-      103,  204,  888,  204,  103,  204,  204,  103,  204,  204,
-
-      103,  204,  294,  205,  926,  180,  180,  205,  929,  186,
-      207, 1256, 1066,  207,  248,  248,  248,  412,  187,  412,
-      188,  248,  248,  248, 1067,  189,  194,  195,  103,  195,
-      194,  194,  194,  194,  194,  194,  194,  196,  194,  412,
-      194,  198,  194,  199,  194,  103,  103,  103,  954,  103,
-      103,  103,  217,  103,  217,  217,  103,  217,  956,  208,
-      252,  194,  194,  208,  252,  252,  218,  200, 1243,  218,
-     1242,  298,  201,  992,  251,  248,  248,  248,  251,  251,
-      412,  202,  194,  195,  103,  195,  194,  194,  194,  194,
-      194,  194,  194,  196,  194,  412,  194,  198,  194,  199,
-
-      194,  103,  103,  103, 1027,  103,  103,  103,  231,  103,
-      231,  231,  103,  231,  412,  219,  412,  194,  194,  219,
-      252,  252,  232,  200, 1148,  232,  892,  306,  201,  248,
-      248,  248,  893, 1026,  251,  251,  412,  202,  209,  210,
-      103,  210,  209,  209,  209,  209,  209,  209,  209,  211,
-      209,  412,  209,  213,  209,  214,  209,  103,  103,  103,
-      412,  103,  103,  103,  231,  103,  231,  231,  103,  231,
-     1327,  233,  927,  209,  209,  233,  952,  412,  232,  412,
-     1087,  232,  248,  248,  248,  248,  248,  248,  215,  209,
-      210,  103,  210,  209,  209,  209,  209,  209,  209,  209,
-
-      211,  209,  925,  209,  213,  209,  214,  209,  231,  103,
-      231,  412,  231,  103,  231,  103,  103,  103,  103,  103,
-      103,  252,  234,  252,  209,  209,  234, 1241,  412,  235,
-      412, 1328,  235,  412,  957,  251,  412,  251,  412,  215,
-      220,  221,  103,  221,  220,  220,  220,  220,  220,  220,
-      220,  222,  220,  252,  220,  224,  220,  225,  220,  244,
-      103,  244,  989,  244,  103,  244,  252,  251,  991,  271,
-      252,  307,  958,  245, 1030,  220,  220,  245,  252,  252,
-      251,  116,  117,  226,  251,  227,  118,  228,  257,  269,
-      412,  412,  251,  251,  246,  229,  220,  221,  103,  221,
-
-      220,  220,  220,  220,  220,  220,  220,  222,  220,  577,
-      220,  224,  220,  225,  220,  247,  116,  117,  320,  412,
-      258,  118,  877,  252,  890,  412,  259, 1028,  315,  246,
-      260,  220,  220,  252, 1057,  261,  878,  251,  412,  226,
-      319,  227,  930,  228,  248,  248,  248,  251, 1193, 1151,
-      247,  229,  236,  237,  103,  237,  236,  236,  236,  236,
-      236,  236,  236,  238,  236,  270,  236,  240,  236,  241,
-      236,  248,  248,  248,  248,  248,  248,  248,  248,  248,
-      248,  248,  248,  252,  248,  248,  248,  236,  236, 1240,
-      332,  425,  425,  425,  474,  474,  474,  251,  515,  515,
-
-      515,  521,  521,  521,  515,  515,  515,  427,  412,  475,
-      242,  236,  237,  103,  237,  236,  236,  236,  236,  236,
-      236,  236,  238,  236,  252,  236,  240,  236,  241,  236,
-      412,  267,  577,  412,  252, 1080, 1116,  252,  251,  425,
-      425,  425,  252, 1081,  267, 1060,  236,  236,  251, 1225,
-     1377,  251,  477,  477,  477,  427,  251,  412,  268,  993,
-      269,  252,  528,  528,  528,  931,  270,  478,  328,  242,
-      271,  268,  272,  274,  273,  251,  268,  529,  269,  270,
-      412,  412,  252,  275,  270,  272,  428,  276,  271,  267,
-      277,  252,  278,  412,  412,  268,  251,  274,  313,  412,
-
-      252,  412,  412,  270, 1224,  251,  994,  275,  412,  272,
-      412,  276, 1223, 1056,  251,  252,  268, 1211,  274,  444,
-      444,  444,  313, 1059,  279,  268,  995,  274,  275,  251,
-      277, 1088,  280,  279,  268,  446,  274,  275,  252,  277,
-     1061,  314,  279,  412, 1029,  327,  275, 1084,  277,  268,
-      314,  274,  251,  252,  454,  454,  454,  279,  534,  534,
-      534,  275,  252,  277, 1222,  280, 1221,  251, 1025,  327,
-      456,  412,  328,  535,  274,  412,  251,  444,  444,  444,
-      279,  454,  454,  454,  275,  412,  277,  328,  280,  274,
-      460,  460,  460,  446,  412,  279,  268,  456,  274,  275,
-
-     1058,  277,  412,  280,  279,  412,  462,  412,  275, 1191,
-      277, 1090,  280,  460,  460,  460, 1091,  469,  469,  469,
-      469,  469,  469,  479,  479,  479,  447, 1063, 1378,  462,
-     1122,  412,  457,  471,  412,  412,  471,  412, 1118,  481,
-      479,  479,  479,  486,  486,  486,  486,  486,  486,  494,
-      494,  494,  494,  494,  494, 1066,  481, 1119,  412,  488,
-     1150,  472,  488,  463, 1173,  496, 1154, 1067,  496,  500,
-      500,  500,  500,  500,  500,  425,  425,  425,  425,  425,
-      425,  425,  425,  425,  412,  502,  412, 1220,  502,  412,
-      482,  427, 1205,  412,  427, 1204,  489,  427,  444,  444,
-
-      444,  444,  444,  444, 1121,  497,  444,  444,  444, 1085,
-      454,  454,  454,  412,  446,  412, 1190,  446,  513,  454,
-      454,  454,  446, 1214,  412,  503,  456,  454,  454,  454,
-     1123,  540,  540,  540,  412,  456,  460,  460,  460,  460,
-      460,  460,  412,  456,  412,  530,  541,  460,  460,  460,
-      412, 1149,  462, 1207, 1215,  462,  545,  545,  545,  469,
-      469,  469, 1208,  462,  469,  469,  469, 1152,  469,  469,
-      469,  546,  474,  474,  474,  471,  477,  477,  477,  412,
-      471,  412, 1227,  538,  471, 1203,  412,  475,  551,  551,
-      551,  478,  552,  412, 1155,  553, 1169,  555,  555,  555,
-
-      412,  556, 1153,  542,  557,  479,  479,  479,  479,  479,
-      479,  479,  479,  479,  561,  561,  561,  486,  486,  486,
-      412,  481,  412,  549,  481, 1171, 1170,  481, 1195,  562,
-      486,  486,  486,  488,  486,  486,  486,  565,  565,  565,
-      494,  494,  494,  494,  494,  494,  488,  494,  494,  494,
-      488,  412,  566,  500,  500,  500,  496, 1231,  412,  496,
-      500,  500,  500,  496,  500,  500,  500,  558, 1167,  502,
-      576,  576,  576,  425,  425,  425,  502,  521,  521,  521,
-      502,  528,  528,  528, 1259, 1202,  577,  578,  412,  427,
-      563,  596,  596,  596, 1209,  597,  529,  569,  598,  444,
-
-      444,  444,  534,  534,  534, 1201,  412,  572,  412,  603,
-      603,  603,  412,  604, 1212,  446,  605,  535,  606,  606,
-      606,  608,  608,  608,  611,  611,  611, 1172,  583,  540,
-      540,  540, 1260,  607,  412,  412,  609,  460,  460,  460,
-      612,  614,  614,  614,  541,  615,  599,  412,  616,  545,
-      545,  545, 1248,  462,  620,  620,  620,  610,  621, 1174,
-      412,  622,  412, 1175,  546,  624,  624,  624,  469,  469,
-      469,  551,  551,  551,  412,  552, 1189, 1186,  553, 1200,
-      625,  555,  555,  555,  471,  556,  412, 1199,  557,  479,
-      479,  479,  617,  561,  561,  561,  633,  633,  633,  412,
-
-      634,  626, 1192,  635,  412,  481,  412, 1194,  562,  486,
-      486,  486,  565,  565,  565,  638,  638,  638,  412,  639,
-     1206,  412,  640,  412, 1226,  488,  627,  566, 1249,  494,
-      494,  494,  645,  645,  645,  500,  500,  500,  576,  576,
-      576,  425,  425,  425,  630,  496, 1228,  646,  661,  661,
-      661,  502, 1310,  412,  577, 1293,  412,  427,  661,  661,
-      661,  667,  667,  667,  636,  444,  444,  444,  643,  667,
-      667,  667,  412,  596,  596,  596,  412,  597,  412,  650,
-      598,  446, 1229,  655,  662,  603,  603,  603, 1232,  604,
-     1245,  647,  605, 1246,  662,  651, 1185,  662,  606,  606,
-
-      606,  663,  673,  673,  673,  662,  674,  412, 1294,  675,
-      412,  665,  412,  607,  663,  608,  608,  608,  611,  611,
-      611,  669,  665,  412,  676,  676,  676,  412,  677, 1269,
-      609,  678,  412, 1244,  612,  614,  614,  614, 1297,  615,
-     1332,  412,  616,  460,  460,  460,  620,  620,  620, 1281,
-      621,  412,  412,  622,  624,  624,  624, 1280,  412,  462,
-      684,  684,  684,  412,  685, 1251, 1263,  686,  412,  625,
-      469,  469,  469,  661,  661,  661,  479,  479,  479,  667,
-      667,  667,  412,  412,  680, 1391,  471,  633,  633,  633,
-     1252,  634,  481, 1264,  635,  486,  486,  486,  638,  638,
-
-      638,  412,  639, 1267,  412,  640,  494,  494,  494,  412,
-      412,  488,  645,  645,  645,  691, 1286,  690, 1184, 1284,
-      688,  412,  496, 1268,  698,  698,  698,  646,  699,  412,
-     1301,  700,  665,  500,  500,  500,  692,  707,  707,  707,
-      425,  425,  425,  661,  661,  661, 1285,  696, 1270,  502,
-     1298,  412,  708,  716,  716,  716,  427,  718,  718,  718,
-      667,  667,  667,  444,  444,  444,  673,  673,  673,  412,
-      674,  412, 1276,  675, 1183,  412,  676,  676,  676,  446,
-      677,  701,  412,  678,  460,  460,  460,  730,  730,  730,
-      709,  684,  684,  684, 1277,  685,  412, 1302,  686,  412,
-
-      462, 1321,  731,  721,  469,  469,  469, 1271,  739,  739,
-      739,  486,  486,  486,  494,  494,  494,  759,  759,  759,
-      471, 1398, 1287,  732,  740, 1182,  412,  488,  412, 1181,
-      496,  698,  698,  698, 1278,  699, 1304,  728,  700,  500,
-      500,  500, 1303,  707,  707,  707, 1180,  742,  412,  754,
-      754,  754,  412,  755,  412,  502,  756,  737,  708,  425,
-      425,  425,  762,  762,  762,  716,  716,  716,  746,  718,
-      718,  718,  765,  765,  765,  427,  766,  766,  766, 1311,
-      748,  444,  444,  444,  776,  776,  776,  730,  730,  730,
-     1279,  779,  779,  779, 1288,  780,  412,  446,  781,  412,
-
-      777,  412,  731,  469,  469,  469,  412,  739,  739,  739,
-      412, 1179,  757,  486,  486,  486,  793,  793,  793,  471,
-     1314,  412,  767,  740,  494,  494,  494, 1320, 1335,  488,
-      412,  794,  500,  500,  500,  801,  801,  801, 1368, 1282,
-      496,  412,  412,  754,  754,  754, 1295,  755,  502,  789,
-      756,  412, 1178,  412,  792,  425,  425,  425,  806,  806,
-      806,  759,  759,  759,  762,  762,  762,  765,  765,  765,
-     1296,  427,  766,  766,  766,  811,  811,  811,  797, 1283,
-     1291,  799,  776,  776,  776,  821,  821,  821,  779,  779,
-      779,  812,  780, 1299, 1176,  781, 1166, 1165,  777, 1164,
-
-      822,  412, 1402,  805,  469,  469,  469,  486,  486,  486,
-      793,  793,  793,  412,  412,  835,  835,  835,  412,  836,
-      471,  823,  837,  488,  412,  794,  838,  838,  838,  841,
-      841,  841,  843,  843,  843,  500,  500,  500,  412, 1292,
-      831,  839,  425,  425,  425,  842,  806,  806,  806,  412,
-     1322,  502, 1315, 1300,  834,  811,  811,  811,  427,  864,
-      864,  864,  821,  821,  821,  866,  866,  866,  412,  867,
-     1163,  812,  868,  412,  865, 1305,  412,  822,  854,  874,
-      874,  874,  469,  469,  469,  486,  486,  486,  412, 1308,
-      844,  801,  801,  801,  875,  835,  835,  835,  471,  836,
-
-      412,  488,  837,  838,  838,  838,  412,  412,  881,  881,
-      881, 1318,  882, 1309, 1372,  883, 1162,  412,  839,  884,
-      884,  884,  841,  841,  841, 1312,  880,  412,  845,  876,
-      846,  843,  843,  843,  885,  412,  847, 1313,  842,  412,
-      848,  412,  849, 1316,  850,  886,  886,  886,  425,  425,
-      425,  864,  864,  864, 1317,  906,  906,  906,  412,  907,
-      412,  887,  908,  412,  427, 1329,  865,  866,  866,  866,
-     1319,  867, 1325, 1336,  868,  874,  874,  874,  912,  912,
-      912,  412,  913,  412, 1330,  914, 1333,  412,  898,  412,
-      875,  469,  469,  469,  486,  486,  486,  881,  881,  881,
-
-     1326,  882,  412, 1161,  883, 1346, 1160,  471, 1439, 1334,
-      488,  884,  884,  884,  920,  920,  920,  412,  921, 1358,
-     1355,  922,  886,  886,  886, 1159,  885,  425,  425,  425,
-      938,  938,  938,  906,  906,  906,  915,  907,  887,  412,
-      908,  412,  919,  427,  412,  939,  944,  944,  944,  912,
-      912,  912,  412,  913, 1337, 1157,  914,  469,  469,  469,
-     1338,  945,  486,  486,  486, 1344,  940, 1345,  933,  412,
-      920,  920,  920,  471,  921, 1156, 1347,  922,  488,  953,
-      953,  953,  960,  960,  960,  425,  425,  425,  964,  964,
-      964,  967,  967,  967,  412,  412,  412,  961,  577,  412,
-
-     1356,  427,  412,  951, 1146,  412,  947,  938,  938,  938,
-      968,  968,  968,  412,  969,  412,  412,  970,  944,  944,
-      944, 1145,  939,  976,  976,  976, 1385,  977, 1359, 1386,
-      978, 1370, 1424,  945,  469,  469,  469, 1339,  412,  963,
-      981,  981,  981,  984,  984,  984,  486,  486,  486,  412,
-      471,  953,  953,  953, 1369,  982, 1348,  412,  985,  996,
-      996,  996,  488,  964,  964,  964,  412,  412,  960,  960,
-      960, 1004, 1004, 1004,  997,  577,  983,  412,  412,  986,
-      980, 1349,  990,  961,  577,  998,  998,  998, 1410,  999,
-      412,  412, 1000, 1407, 1144,  988,  425,  425,  425,  412,
-
-     1353,  577,  967,  967,  967,  412,  968,  968,  968, 1354,
-      969,  412,  427,  970, 1009, 1009, 1009,  976,  976,  976,
-     1366,  977,  412, 1371,  978, 1011, 1011, 1011,  412, 1010,
-     1013, 1013, 1013, 1367,  412, 1002,  981,  981,  981, 1389,
-     1012, 1015, 1015, 1015, 1411, 1016, 1014,  412, 1017, 1373,
-      412,  982,  984,  984,  984, 1019, 1019, 1019,  412, 1020,
-     1375, 1431, 1021, 1023, 1023, 1023, 1376,  985,  486,  486,
-      486, 1031, 1031, 1031,  996,  996,  996,  412, 1034, 1034,
-     1034, 1381, 1035,  412,  488, 1036, 1432,  412, 1442,  997,
-      577, 1004, 1004, 1004,  577,  998,  998,  998, 1390,  999,
-
-      412, 1394, 1000,  425,  425,  425,  412, 1032, 1046, 1046,
-     1046,  577, 1047,  412, 1382, 1048, 1023, 1023, 1023,  427,
-     1009, 1009, 1009, 1024, 1033,  575,  575,  575,  575,  575,
-      575,  575,  575,  575, 1143, 1010,  575, 1395, 1383,  575,
-      575,  575,  577,  575, 1011, 1011, 1011, 1049, 1049, 1049,
-      412, 1050, 1142,  412, 1051, 1141, 1040,  412,  412, 1012,
-      575,  575,  575,  575,  575,  575,  575,  575,  575,  575,
-      575,  412,  412,  575,  412,  412,  575,  575,  575,  577,
-      575, 1414, 1384, 1013, 1013, 1013, 1015, 1015, 1015, 1387,
-     1016, 1396,  412, 1017, 1054, 1054, 1054,  575,  575, 1014,
-
-     1019, 1019, 1019, 1388, 1020, 1392, 1393, 1021,  412, 1397,
-     1055, 1031, 1031, 1031, 1064, 1064, 1064, 1034, 1034, 1034,
-     1137, 1035, 1399, 1400, 1036, 1403,  412,  412, 1402,  412,
-      412,  412,  412,  577, 1046, 1046, 1046,  412, 1047, 1401,
-      412, 1048, 1062,  575,  575,  575,  575,  575, 1070,  575,
-      575,  575,  412,  412,  575, 1460, 1127,  575,  575,  575,
-      577,  575, 1049, 1049, 1049, 1435, 1050,  412, 1405, 1051,
-     1196, 1196, 1196,  425,  425,  425, 1415, 1406,  575,  575,
-      575,  575,  575,  575,  575,  575,  575,  575, 1070,  427,
-     1429,  575, 1404, 1408,  575,  575,  575,  577,  575,  412,
-
-      412, 1054, 1054, 1054, 1086, 1086, 1086, 1089, 1089, 1089,
-     1064, 1064, 1064, 1442, 1409,  575,  575, 1055, 1072, 1125,
-      412,  412,  412,  412,  412, 1094,  412, 1096, 1096, 1096,
-      425,  425,  425, 1100, 1100, 1100, 1102, 1102, 1102,  412,
-     1416, 1092, 1417,  577,  578,  412,  427,  412, 1101,  412,
-     1422, 1103, 1104, 1104, 1104, 1107, 1107, 1107, 1115, 1115,
-     1115, 1086, 1086, 1086, 1089, 1089, 1089, 1105,  412,  412,
-     1108, 1096, 1096, 1096,  412, 1124,  412,  412,  412, 1412,
-      412, 1098,  425,  425,  425, 1413,  412,  577, 1106, 1100,
-     1100, 1100, 1117, 1420, 1423, 1120, 1094,  412,  427, 1128,
-
-     1128, 1128, 1421, 1129, 1101,  412, 1130, 1102, 1102, 1102,
-     1425,  412,  650, 1131, 1131, 1131, 1114, 1132,  412, 1437,
-     1133, 1426, 1103, 1104, 1104, 1104, 1134, 1134, 1134, 1427,
-     1135,  412,  412, 1136, 1107, 1107, 1107, 1126, 1105, 1138,
-     1138, 1138, 1428, 1139,  412,  412, 1140,  412, 1430, 1108,
-     1115, 1115, 1115,  425,  425,  425, 1128, 1128, 1128,  412,
-     1129, 1113, 1464, 1130, 1112,  412,  412, 1111, 1433,  427,
-     1131, 1131, 1131, 1443, 1132, 1438,  412, 1133, 1134, 1134,
-     1134, 1147, 1135, 1434, 1436, 1136, 1138, 1138, 1138, 1110,
-     1139, 1444,  412, 1140, 1168, 1168, 1168,  412, 1158,  425,
-
-      425,  425, 1168, 1168, 1168,  412, 1187, 1453, 1451, 1188,
-      412,  425,  425,  425,  412,  427, 1445, 1460,  412, 1198,
-     1198, 1198, 1210, 1210, 1210, 1109,  412,  427, 1213, 1213,
-     1213, 1196, 1196, 1196, 1216, 1216, 1216, 1452,  412, 1198,
-     1198, 1198,  412,  412,  412, 1465, 1218, 1218, 1218, 1177,
-     1217, 1210, 1210, 1210,  412, 1213, 1213, 1213, 1099, 1233,
-     1197, 1219, 1234, 1235, 1235, 1235, 1097,  412, 1236, 1236,
-     1236,  412, 1216, 1216, 1216, 1218, 1218, 1218, 1446,  412,
-     1499, 1440, 1230,  412,  412, 1237, 1237, 1237, 1217, 1238,
-     1219, 1094, 1239, 1247, 1247, 1247, 1250, 1250, 1250, 1235,
-
-     1235, 1235,  412, 1236, 1236, 1236, 1475, 1254,  412,  412,
-     1255,  412,  412,  412,  412,  412, 1237, 1237, 1237,  412,
-     1238, 1463, 1441, 1239, 1258, 1258, 1258, 1247, 1247, 1247,
-     1253, 1261, 1449,  412, 1262, 1250, 1250, 1250, 1450, 1265,
-      412, 1447, 1266,  412,  412, 1258, 1258, 1258,  412, 1274,
-     1448,  412, 1275, 1331, 1331, 1331, 1340, 1340, 1340, 1094,
-      412,  412, 1342, 1342, 1342,  412, 1331, 1331, 1331,  412,
-     1350, 1341, 1454, 1351, 1352, 1352, 1352, 1343, 1357, 1357,
-     1357, 1500,  412, 1340, 1340, 1340, 1342, 1342, 1342, 1455,
-      412,  412, 1468,  412,  412, 1360, 1360, 1360, 1341, 1361,
-
-     1463, 1343, 1362, 1363, 1363, 1363, 1083, 1364, 1467,  412,
-     1365, 1352, 1352, 1352, 1357, 1357, 1357, 1082, 1379,  412,
-      412, 1380, 1360, 1360, 1360,  412, 1361,  412,  412, 1362,
-      412, 1363, 1363, 1363, 1458, 1364, 1459,  412, 1365, 1418,
-     1418, 1418, 1374, 1418, 1418, 1418, 1456, 1456, 1456, 1461,
-     1481, 1467, 1462, 1077, 1076, 1419, 1466, 1466, 1466, 1419,
-      412, 1472, 1457, 1456, 1456, 1456, 1470, 1470, 1470, 1469,
-     1476, 1472,  412,  412, 1473, 1473, 1473,  412,  412, 1457,
-      412,  412, 1471,  412, 1466, 1466, 1466,  412, 1477,  412,
-     1474, 1478, 1479, 1479, 1479, 1470, 1470, 1470,  412,  412,
-
-      412, 1483, 1483, 1483, 1473, 1473, 1473, 1485, 1480, 1482,
-      412, 1471,  412, 1486, 1479, 1479, 1479, 1484,  412, 1487,
-     1474, 1489, 1490,  412,  412, 1488,  412,  412,  412,  412,
-     1480, 1483, 1483, 1483,  412, 1503,  412, 1491, 1492,  412,
-      412, 1503, 1495,  412,  412,  412,  412, 1484, 1496, 1512,
-     1493, 1497, 1494,  412, 1508, 1508, 1508, 1075, 1498, 1512,
-     1506,  412, 1501, 1507,  412, 1502, 1504,  412,  412, 1505,
-     1509, 1508, 1508, 1508, 1515, 1515, 1515,  412,  412, 1515,
-     1515, 1515,  412,  412, 1519, 1520,  412, 1509, 1510, 1511,
-     1516,  412,  412,  412,  412, 1516, 1513,  412, 1527, 1514,
-
-     1074, 1073, 1527, 1528, 1528, 1528, 1521, 1522, 1517, 1518,
-      412,  412, 1528, 1528, 1528, 1071, 1053, 1052, 1525, 1529,
-     1045, 1526, 1044, 1043, 1042, 1523, 1041, 1039, 1529, 1022,
-     1018, 1008, 1524,  100,  100,  100,  100,  100,  100,  100,
-      101,  101,  101,  101,  101,  101,  101,  106,  106,  106,
-      106,  106,  106,  106,  109,  109,  109,  109,  109,  109,
-      109,  112,  112,  112,  112,  112,  112,  112,  115,  115,
-      115,  115,  115,  115,  115,  122,  122,  122,  122,  122,
-      122,  122,  130,  130,  130,  130,  130,  130,  130,  134,
-      134,  134,  134,  134,  134,  134,  145,  145,  145,  145,
-
-      145,  145,  145,  149,  149,  149,  149,  149,  149,  149,
-      165,  165,  165,  165,  165,  165,  165,  172,  172,  172,
-      172,  172,  172,  172,  176,  176,  176,  176,  176,  176,
-      176,  183,  183,  183,  183,  183,  183,  183,  190,  190,
-      190,  190,  190,  190,  190,  197,  197,  197,  197,  197,
-      197,  197,  203,  203,  203,  203,  203,  203,  203,  212,
-      212,  212,  212,  212,  212,  212,  216,  216,  216,  216,
-      216,  216,  216,  223,  223,  223,  223,  223,  223,  223,
-      230,  230,  230,  230,  230,  230,  230,  239,  239,  239,
-      239,  239,  239,  239,  243,  243,  243,  243,  243,  243,
-
-      243,  265,  265,  265, 1007,  265,  282,  282,  282, 1006,
-      282,  286,  286,  286, 1005,  286,  296,  296,  296, 1003,
-      296,  300,  300,  300, 1001,  300,  309,  309,  309,  987,
-      309,  317,  317,  317,  979,  317,  322,  322,  322,  975,
-      322,  330,  330,  330,  974,  330,  335,  335,  335,  335,
-      335,  971,  335,  350,  966,  350,  367,  965,  367,  375,
-      962,  375,  379,  950,  379,  386,  949,  386,  392,  948,
-      392,  397,  946,  397,  403,  943,  403,  407,  942,  407,
-      411,  411,  411,  411,  411,  411,  411,  417,  941,  937,
-      417,  426,  426,  426,  426,  426,  426,  445,  445,  445,
-
-      445,  445,  445,  455,  455,  455,  455,  455,  455,  461,
-      461,  461,  461,  461,  461,  470,  470,  470,  470,  470,
-      470,  480,  480,  480,  480,  480,  480,  487,  487,  487,
-      487,  487,  487,  495,  495,  495,  495,  495,  495,  501,
-      501,  501,  501,  501,  501,  575,  575,  575,  575,  575,
-      575,  575, 1037, 1037, 1037, 1037, 1037, 1037, 1037, 1038,
-     1038, 1038, 1038, 1038, 1038, 1038, 1065, 1065, 1065, 1065,
-     1065, 1065, 1065, 1068, 1068, 1068, 1068, 1068, 1068, 1068,
-     1093, 1093, 1093, 1093, 1093, 1093, 1093, 1095, 1095, 1095,
-     1095, 1095, 1095, 1095,  936,  935,  934,  932,  918,  917,
-
-      916,  911,  910,  909,  905,  904,  903,  902,  901,  900,
-      899,  897,  879,  873,  872,  871,  870,  869,  863,  862,
-      861,  860,  859,  858,  857,  856,  855,  853,  840,  833,
-      832,  830,  829,  828,  827,  826,  825,  824,  820,  819,
-      818,  817,  816,  815,  814,  813,  810,  809,  808,  807,
-      804,  800,  798,  796,  795,  791,  790,  788,  783,  782,
-      778,  775,  770,  769,  768,  764,  763,  761,  760,  758,
-      753,  749,  747,  745,  744,  743,  741,  738,  736,  735,
-      734,  733,  729,  727,  726,  725,  724,  723,  722,  720,
-      719,  717,  715,  714,  713,  712,  711,  710,  706,  702,
-
-      697,  695,  694,  693,  691,  689,  687,  683,  682,  681,
-      663,  679,  672,  671,  670,  668,  666,  664,  660,  659,
-      658,  657,  656,  654,  653,  652,  577,  648,  644,  642,
-      641,  637,  632,  631,  629,  628,  623,  619,  618,  613,
-      602,  601,  600,  595,  594,  593,  592,  591,  590,  589,
-      588,  587,  586,  585,  584,  582,  581,  580,  579,  573,
-      571,  570,  568,  567,  564,  560,  559,  554,  550,  548,
-      547,  544,  543,  539,  537,  536,  533,  532,  531,  527,
-      526,  525,  524,  523,  522,  520,  519,  518,  517,  516,
-      514,  512,  511,  510,  509,  508,  507,  506,  412,  504,
-
-      499,  498,  493,  492,  491,  490,  485,  484,  483,  476,
-      473,  468,  467,  466,  465,  464,  459,  458,  453,  452,
-      451,  450,  449,  448,  443,  442,  441,  440,  439,  438,
-      437,  436,  435,  434,  433,  432,  431,  430,  429,  424,
-      423,  422,  421,  420,  419,  418,  415,  413,  412,  410,
-      409,  408,  406,  405,  404,  402,  401,  400,  399,  357,
-      398,  396,  395,  394,  393,  391,  390,  389,  388,  387,
-      385,  384,  383,  382,  381,  380,  378,  377,  376,  374,
-      373,  372,  371,  370,  369,  368,  366,  365,  364,  363,
-      361,  360,  359,  358,  355,  354,  353,  352,  351,  349,
-
-      348,  347,  346,  345,  344,  339,  336,  338,  334,  333,
-      331,  329,  326,  325,  324,  323,  321,  318,  316,  312,
-      311,  310,  308,  303,  302,  301,  299,  297,  295,  292,
-      291,  290,  289,  288,  287,  285,  283,  281,  266,  264,
-      262,  256,  255,  256,  255,  254,  253, 1530,   99, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530
+     1516,  142,  143,  142,  142,  143,  142,  142,  143,  142,
+      142,  143,  142,  150, 1516,  144,  150,  153,  144,  153,
+      151,  145, 1038,  151,  145,  147,  143,  147,  147,  143,
+      147,  156,  157,  154, 1039,  154,  158,  159,  391,  148,
+      156,  157,  148,  387,  160,  158,  159,  156,  157,  337,
+      161,  304,  158,  160,  156,  157,  388,  161,  338,  158,
+      160,  163,  164,  163,  164,  305,  304,  160,  143,  143,
+      143,  143,  143,  143,  175,  143,  175,  175,  143,  175,
+      306,  307,  166,  307,  463,  166,  393,  392,  176,  394,
+      766,  176,  303,  303,  303,  306,  165,  306,  165,  167,
+
+      168,  143,  168,  167,  167,  167,  167,  167,  167,  167,
+      169,  167, 1318,  167,  171,  167,  172,  167,  143,  143,
+      143,  463,  358,  143,  143,  143,  175,  143,  175,  175,
+      143,  175,  177,  359,  465,  167,  167,  177,  620,  391,
+      178,  467,  307,  178,  303,  303,  303,  303,  303,  303,
+      303,  303,  303,  303,  303,  303,  306,  620,  173,  167,
+      168,  143,  168,  167,  167,  167,  167,  167,  167,  167,
+      169,  167,  729,  167,  171,  167,  172,  167,  175,  143,
+      175,  767,  463,  175,  143,  175,  143,  143,  143,  143,
+      143,  143,  179,  329,  463,  167,  167,  179,  563,  617,
+
+      180,  620,  463,  180,  620,  175,  143,  175,  175,  143,
+      175,  175,  143,  175,  175,  143,  175,  463,  173,  181,
+      675,  620,  181, 1119,  463,  182,  853,  307,  182,  143,
+      143,  143,  143,  143,  143,  175,  143,  175,  175,  143,
+      175,  306,  768,  183,  620,  780,  183,  730,  915,  179,
+      781,  307,  179,  175,  143,  175,  175,  143,  175,  143,
+      143,  143,  143,  143,  143,  306,  782,  184, 1317,  323,
+      184,  783, 1297,  185,  854,  307,  185,  175,  143,  175,
+      175,  143,  175,  175,  143,  175,  175,  143,  175,  306,
+      793,  182,  463,  795,  182,  794,  325,  186,  796,  307,
+
+      186,  143,  143,  143,  143,  143,  143,  175,  143,  175,
+      175,  143,  175,  306,  620,  187,  463,  463,  187,  952,
+      953,  184,  888,  307,  184,  143,  143,  143,  143,  143,
+      143,  175,  143,  175,  175,  143,  175,  306,  917,  188,
+      463, 1002,  188,  463,  892,  186,  463,  307,  186,  175,
+      143,  175,  175,  143,  175,  143,  143,  143,  143,  143,
+      143,  306, 1296,  189,  463, 1276,  189,  971,  620,  177,
+      463,  913,  177,  190,  191,  143,  191,  190,  190,  190,
+      190,  190,  190,  190,  192,  190,  936,  190,  194,  190,
+      195,  190,  198,  143,  198,  938,  318,  198,  143,  198,
+
+      143,  143,  143,  303,  303,  303,  199,  811,  885,  190,
+      190,  199,  463,  463,  180,  463,  463,  196,  190,  191,
+      143,  191,  190,  190,  190,  190,  190,  190,  190,  192,
+      190, 1028,  190,  194,  190,  195,  190,  143,  143,  143,
+     1000,  620,  212,  143,  212,  212,  143,  212,  303,  303,
+      303,  180,  463,  919,  190,  190,  213,  935, 1275,  213,
+      620,  621,  196,  200,  201,  143,  201,  200,  200,  200,
+      200,  200,  200,  200,  202,  200,  810,  200,  204,  200,
+      205,  200,  143,  143,  143,  463,  887,  143,  143,  143,
+      212,  143,  212,  212,  143,  212,  214,  307,  307,  200,
+
+      200,  214,  206,  307,  213,  322, 1038,  213,  463, 1255,
+      207,  306,  306,  208,  620, 1041,  209,  306,  966,  210,
+      200,  201,  143,  201,  200,  200,  200,  200,  200,  200,
+      200,  202,  200,  463,  200,  204,  200,  205,  200,  212,
+      143,  212,  943,  886,  212,  143,  212,  143,  143,  143,
+      143,  143,  143,  215,  328,  307,  200,  200,  215,  206,
+      307,  214,  333, 1254,  214,  889, 1049,  207, 1236,  306,
+      208,  890,  463,  209,  306, 1050,  210,  216,  217,  143,
+      217,  216,  216,  216,  216,  216,  216,  216,  218,  216,
+      463,  216,  220,  216,  221,  216,  225,  143,  225,  463,
+
+      463,  225,  143,  225,  143,  143,  143,  143,  143,  143,
+      226,  307,  939,  216,  216,  226,  307, 1030,  183, 1235,
+      307,  183, 1219, 1218,  222,  306,  303,  303,  303,  914,
+      306,  303,  303,  303,  306,  891,  223,  216,  217,  143,
+      217,  216,  216,  216,  216,  216,  216,  216,  218,  216,
+      463,  216,  220,  216,  221,  216,  235,  143,  235,  324,
+      326,  235,  143,  235,  143,  143,  143,  143,  143,  143,
+      236,  307,  307,  216,  216,  236,  307,  463,  185,  342,
+      307,  185,  937,  322,  222,  306,  306,  303,  303,  303,
+      306,  303,  303,  303,  306,  463,  223,  227,  228,  143,
+
+      228,  227,  227,  227,  227,  227,  227,  227,  229,  227,
+     1060,  227,  231,  227,  232,  227,  248,  143,  248,  324,
+      343,  248,  143,  248,  143,  143,  143,  143,  143,  143,
+      249, 1051,  620,  227,  227,  249,  968,  463,  214,  463,
+     1052,  214,  463, 1121,  233,  227,  228,  143,  228,  227,
+      227,  227,  227,  227,  227,  227,  229,  227,  463,  227,
+      231,  227,  232,  227,  248,  143,  248,  893,  972,  248,
+      143,  248,  248,  143,  248,  248,  143,  248,  249,  942,
+      463,  227,  227,  249,  974,  463,  250, 1217,  463,  250,
+      463, 1125,  233,  237,  238,  143,  238,  237,  237,  237,
+
+      237,  237,  237,  237,  239,  237, 1034,  237,  241,  237,
+      242,  237,  143,  143,  143,  918,  998,  143,  143,  143,
+      261,  143,  261,  261,  143,  261,  187,  307,  463,  237,
+      237,  187,  307,  243,  262, 1216, 1038,  262, 1198,  348,
+      244,  306,  245,  303,  303,  303,  306,  463, 1039,  246,
+      237,  238,  143,  238,  237,  237,  237,  237,  237,  237,
+      237,  239,  237, 1003,  237,  241,  237,  242,  237,  143,
+      143,  143,  367, 1029,  143,  143,  143,  261,  143,  261,
+      261,  143,  261,  263,  307, 1197,  237,  237,  263,  307,
+      243,  262,  463, 1426,  262,  463,  352,  244,  306,  245,
+
+      303,  303,  303,  306,  463,  463,  246,  251,  252,  143,
+      252,  251,  251,  251,  251,  251,  251,  251,  253,  251,
+     1056,  251,  255,  251,  256,  251,  261,  143,  261,  916,
+     1032,  261,  143,  261,  143,  143,  143,  143,  143,  143,
+      264, 1038, 1196,  251,  251,  264,  463,  307,  263,  257,
+     1041,  263,  620,  620,  258,  303,  303,  303,  303,  303,
+      303,  306, 1058,  259,  251,  252,  143,  252,  251,  251,
+      251,  251,  251,  251,  251,  253,  251,  463,  251,  255,
+      251,  256,  251,  273,  143,  273,  920,  921,  273,  143,
+      273,  143,  143,  143,  143,  143,  143,  274, 1426,  463,
+
+      251,  251,  274,  307,  463,  188,  257,  463,  188,  463,
+      360,  258,  303,  303,  303, 1062, 1004,  306,  728,  463,
+      259,  265,  266,  143,  266,  265,  265,  265,  265,  265,
+      265,  265,  267,  265, 1123,  265,  269,  265,  270,  265,
+      286,  143,  286,  940,  463,  286,  143,  286,  143,  143,
+      143,  143,  143,  143,  287,  941,  463,  265,  265,  287,
+     1195, 1087,  288,  463,  463,  288,  463, 1139,  271,  265,
+      266,  143,  266,  265,  265,  265,  265,  265,  265,  265,
+      267,  265, 1094,  265,  269,  265,  270,  265,  286,  143,
+      286,  463,  463,  286,  143,  286,  286,  143,  286,  286,
+
+      143,  286,  287, 1031, 1055,  265,  265,  287,  463, 1089,
+      289,  463, 1194,  289, 1146, 1193,  271,  275,  276,  143,
+      276,  275,  275,  275,  275,  275,  275,  275,  277,  275,
+     1033,  275,  279,  275,  280,  275,  143,  143,  143,  463,
+      463,  143,  143,  143,  299,  143,  299,  303,  303,  303,
+      290, 1141, 1221,  275,  275,  290,  874,  307,  300,  463,
+     1091,  281,  463,  282,  322,  283,  312,  303,  303,  303,
+      875,  306,  463,  284,  275,  276,  143,  276,  275,  275,
+      275,  275,  275,  275,  275,  277,  275,  463,  275,  279,
+      275,  280,  275,  299,  143,  299,  303,  303,  303,  313,
+
+     1222, 1162,  325, 1175, 1093,  314,  326,  300,  327,  315,
+      275,  275,  307, 1224,  316,  463,  156,  157,  281,  322,
+      282,  158,  283,  303,  303,  303,  306,  463,  463,  301,
+      284,  291,  292,  143,  292,  291,  291,  291,  291,  291,
+      291,  291,  293,  291, 1126,  291,  295,  291,  296,  291,
+     1308,  302,  156,  157,  303,  303,  303,  158,  303,  303,
+      303,  326, 1027,  328,  307,  301,  307,  291,  291,  307,
+      307,  322,  307,  342,  307,  307,  322,  366,  306,  360,
+      306,  322,  371,  306,  306, 1174,  306,  302,  306,  306,
+      297,  291,  292,  143,  292,  291,  291,  291,  291,  291,
+
+      291,  291,  293,  291,  463,  291,  295,  291,  296,  291,
+      307,  323,  324,  326,  325,  343,  323,  322,  326,  325,
+      327,  343,  307,  326,  306,  327,  307,  291,  291,  366,
+      307,  307,  307,  378,  307,  463,  306,  378, 1059,  383,
+      306,  303,  303,  303,  306,  306,  306, 1173,  306,  463,
+      297,  303,  303,  303,  463,  325,  414,  414,  414,  326,
+      463,  328,  423,  423,  423,  379,  379,  367, 1300,  379,
+     1127,  415,  428,  428,  428, 1143,  463,  424, 1063,  343,
+      343,  433,  433,  433,  446,  446,  446,  429,  476,  476,
+      476,  476,  476,  476, 1095,  463,  434,  463,  463,  447,
+
+      488,  488,  488,  463,  478,  463, 1145,  478,  488,  488,
+      488,  414,  414,  414, 1140, 1120,  490,  463,  493,  493,
+      493, 1124,  494, 1138,  490,  495,  415,  500,  500,  500,
+      500,  500,  500,  423,  423,  423,  509,  509,  509,  479,
+      505,  505,  505,  502,  506,  463,  502,  507,  424,  509,
+      509,  509,  511,  428,  428,  428,  463, 1266,  491,  513,
+      513,  513, 1147,  514, 1172,  511,  515, 1165,  429,  516,
+      516,  516,  516,  516,  516,  433,  433,  433,  527,  527,
+      527,  503,  521,  521,  521,  518,  522,  463,  518,  523,
+      434,  527,  527,  527,  529,  531,  531,  531,  534,  534,
+
+      534, 1171,  463,  512,  536,  536,  536,  529, 1166,  463,
+      532, 1183,  463,  535,  536,  536,  536,  446,  446,  446,
+      538, 1170,  463,  519,  541,  541,  541, 1142,  542, 1159,
+      538,  543,  447,  544,  544,  544,  463,  530,  544,  544,
+      544,  552,  552,  552,  552,  552,  552,  463,  463,  546,
+      558,  558,  558, 1163,  546,  463, 1329,  554, 1188,  463,
+      554,  558,  558,  558, 1144,  539,  560,  476,  476,  476,
+      476,  476,  476,  476,  476,  476, 1176,  560,  579,  579,
+      579,  463,  463,  478,  547, 1227,  478, 1169, 1179,  478,
+      488,  488,  488,  580,  488,  488,  488, 1157,  555,  463,
+
+      488,  488,  488,  627,  627,  627,  490,  500,  500,  500,
+      490,  571,  500,  500,  500,  561,  490,  493,  493,  493,
+      463,  494,  463,  502,  495,  500,  500,  500,  502,  505,
+      505,  505, 1301,  506,  463,  463,  507,  509,  509,  509,
+      581,  502,  509,  509,  509,  509,  509,  509,  513,  513,
+      513, 1161,  514,  511,  463,  515,  463, 1156,  511, 1200,
+     1206,  511,  516,  516,  516,  516,  516,  516,  516,  516,
+      516, 1182,  521,  521,  521, 1225,  522,  463,  518,  523,
+      587,  518,  463, 1184,  518,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  463, 1201,  590,  531,  531,  531,
+
+     1199,  529,  463,  463,  529,  463,  463,  529, 1205,  597,
+      597,  597,  532,  598, 1202,  463,  599,  534,  534,  534,
+      601,  601,  601, 1229,  602,  591, 1207,  603,  536,  536,
+      536,  463,  535,  536,  536,  536,  536,  536,  536,  463,
+      463,  596, 1220, 1238,  538, 1203,  541,  541,  541,  538,
+      542, 1226,  538,  543,  544,  544,  544,  544,  544,  544,
+      544,  544,  544,  608,  608,  608,  552,  552,  552,  463,
+      546,  463,  463,  546,  463, 1450,  546, 1239,  609,  552,
+      552,  552,  554,  552,  552,  552,  558,  558,  558,  558,
+      558,  558,  463,  604,  463,  554,  558,  558,  558,  554,
+
+      463, 1258,  560, 1155,  463,  560,  619,  619,  619, 1242,
+      606, 1204,  560,  476,  476,  476,  629,  629,  629,  647,
+      647,  647,  620,  621,  579,  579,  579, 1304,  463,  478,
+     1243,  634,  634,  634,  612,  635, 1245, 1305,  636,  580,
+      615,  488,  488,  488,  641,  641,  641,  643,  643,  643,
+      500,  500,  500,  648,  648,  648, 1154,  490,  463,  642,
+      463,  463,  644,  509,  509,  509,  502, 1208,  649,  626,
+      516,  516,  516,  655,  655,  655,  527,  527,  527,  511,
+      536,  536,  536,  463,  645, 1259,  518,  463,  656,  637,
+     1153, 1287,  529,  597,  597,  597,  538,  598, 1429, 1209,
+
+      599,  601,  601,  601, 1152,  602,  646,  463,  603, 1151,
+      657,  544,  544,  544,  463,  650,  608,  608,  608,  671,
+      671,  671,  463,  658, 1230, 1248,  651,  546,  664,  664,
+      664,  609,  665,  463,  672,  666,  660,  552,  552,  552,
+      558,  558,  558,  619,  619,  619,  476,  476,  476,  627,
+      627,  627, 1249,  554, 1150, 1148,  560,  463,  662,  620,
+     1262, 1231,  478,  629,  629,  629,  684,  684,  684,  684,
+      684,  684,  634,  634,  634,  463,  635,  669,  463,  636,
+      488,  488,  488,  463, 1263,  676,  647,  647,  647,  681,
+      641,  641,  641,  643,  643,  643,  490,  673,  648,  648,
+
+      648,  677,  690,  690,  690,  642,  691, 1137,  644,  692,
+      693,  693,  693,  649,  694,  463, 1250,  695,  463, 1251,
+      685, 1271,  697,  697,  697,  699,  699,  699,  463,  700,
+      463,  463,  701,  702,  702,  702, 1136,  686,  698,  516,
+      516,  516,  655,  655,  655, 1269,  708,  708,  708,  703,
+      709,  463,  463,  710, 1232,  518, 1369,  656,  712,  712,
+      712,  536,  536,  536,  544,  544,  544, 1252,  664,  664,
+      664, 1273,  665, 1135,  713,  666,  717,  538, 1270,  463,
+      546,  704,  552,  552,  552,  671,  671,  671,  723,  723,
+      723, 1253,  724, 1134,  463,  725,  463,  463,  554, 1133,
+
+      672,  463,  463,  715,  558,  558,  558,  732,  732,  732,
+      476,  476,  476,  684,  684,  684,  737,  737,  737, 1396,
+      560, 1132,  733, 1279,  721,  463,  478,  488,  488,  488,
+      690,  690,  690, 1260,  691, 1261, 1267,  692,  693,  693,
+      693, 1268,  694,  490,  463,  695,  697,  697,  697,  463,
+      699,  699,  699,  726,  700,  463,  463,  701,  702,  702,
+      702,  734,  698,  516,  516,  516, 1274,  463,  738,  747,
+      747,  747, 1432, 1131,  703, 1129,  708,  708,  708,  518,
+      709, 1321, 1272,  710,  748,  712,  712,  712,  755,  755,
+      755,  544,  544,  544,  552,  552,  552, 1281,  723,  723,
+
+      723,  713,  724,  463,  756,  725,  749,  546, 1282, 1429,
+      554,  558,  558,  558,  732,  732,  732,  745,  770,  770,
+      770,  463,  771,  463,  463,  772,  463,  560,  463,  733,
+      463,  758,  476,  476,  476,  774,  774,  774,  775,  775,
+      775,  737,  737,  737, 1288,  488,  488,  488,  478,  762,
+      785,  785,  785,  764,  747,  747,  747, 1292,  788,  788,
+      788,  490,  789, 1277, 1289,  790,  786, 1278,  463,  748,
+     1280,  463,  755,  755,  755,  544,  544,  544,  801,  801,
+      801,  552,  552,  552, 1128, 1344,  773,  776,  756, 1117,
+     1116,  546,  463,  802,  558,  558,  558,  554,  809,  809,
+
+      809,  770,  770,  770,  463,  771,  463, 1285,  772, 1294,
+      560,  476,  476,  476,  463,  774,  774,  774,  775,  775,
+      775,  814,  814,  814,  785,  785,  785,  478,  824,  824,
+      824,  800,  835,  835,  835,  463,  805,  815, 1115,  463,
+      786, 1114, 1435,  825,  807,  788,  788,  788, 1283,  789,
+     1284,  463,  790,  544,  544,  544,  801,  801,  801,  463,
+      813,  840,  840,  840, 1370,  826,  837,  837,  837,  546,
+      838,  802,  463,  839, 1286,  463,  841,  843,  843,  843,
+      845,  845,  845,  558,  558,  558,  476,  476,  476,  814,
+      814,  814,  463,  844,  862,  862,  862, 1295, 1113,  560,
+
+      463, 1112,  478,  836, 1108,  815,  824,  824,  824,  863,
+      864,  864,  864, 1302,  865,  463, 1290,  866,  872,  872,
+      872,  825,  463,  856,  835,  835,  835,  876,  876,  876,
+      837,  837,  837,  873,  838,  463, 1291,  839, 1303,  846,
+      809,  809,  809,  877,  840,  840,  840,  878,  878,  878,
+      463,  879,  463, 1309,  880, 1311,  463,  463,  463,  841,
+      881,  881,  881,  843,  843,  843,  845,  845,  845, 1464,
+      463,  883,  883,  883,  463,  882, 1298, 1293,  847,  844,
+      476,  476,  476,  463,  463,  848,  849,  884,  850,  862,
+      862,  862,  851, 1299,  852, 1310,  478,  463,  899,  899,
+
+      899, 1315,  900,  463,  863,  901,  864,  864,  864,  463,
+      865, 1306, 1097,  866,  872,  872,  872, 1312,  905,  905,
+      905,  895,  906,  463, 1307,  907,  876,  876,  876,  873,
+      878,  878,  878,  463,  879, 1322, 1316,  880,  881,  881,
+      881, 1313,  877,  910,  910,  910,  463,  911, 1066,  463,
+      912, 1435,  463,  882,  883,  883,  883,  476,  476,  476,
+      924,  924,  924,  463,  899,  899,  899, 1314,  900,  463,
+      884,  901, 1491,  478,  463,  925,  930,  930,  930,  905,
+      905,  905,  463,  906, 1319, 1334,  907, 1320,  910,  910,
+      910,  931,  911,  463, 1096,  912, 1323,  926,  463,  923,
+
+      944,  944,  944,  476,  476,  476,  924,  924,  924, 1324,
+      948,  948,  948, 1066,  949,  945,  620,  950, 1336,  478,
+      463,  925,  930,  930,  930,  956,  956,  956,  463,  957,
+     1325, 1327,  958,  960,  960,  960, 1085,  931,  963,  963,
+      963,  967,  967,  967,  969,  969,  969, 1084,  961,  973,
+      973,  973, 1326,  964,  463, 1330,  970,  463,  947,  463,
+      463,  975,  975,  975,  463,  463,  944,  944,  944,  463,
+      962, 1083,  476,  476,  476,  965,  976,  620, 1006, 1006,
+     1006,  945,  620,  977,  977,  977, 1332,  978,  478,  463,
+      979,  948,  948,  948,  463,  949, 1331, 1328,  950,  620,
+
+      986,  986,  986,  956,  956,  956,  463,  957, 1337,  463,
+      958,  463,  981, 1082, 1373,  987,  988,  988,  988,  960,
+      960,  960,  990,  990,  990,  463,  991,  463, 1081,  992,
+      463,  989, 1007, 1342,  961,  963,  963,  963,  994,  994,
+      994, 1333,  995, 1415, 1335,  996,  967,  967,  967, 1080,
+      964,  969,  969,  969,  973,  973,  973,  975,  975,  975,
+      463,  463,  463, 1359, 1008, 1008, 1008,  463, 1009, 1346,
+      463, 1010,  976,  620, 1345,  977,  977,  977,  999,  978,
+      620,  463,  979, 1001,  463,  463, 1005, 1343,  476,  476,
+      476,  620,  618,  618,  618,  618,  618,  618,  618,  618,
+
+      618, 1069, 1066,  618,  478, 1347,  618,  618,  618,  620,
+      618,  986,  986,  986, 1019, 1019, 1019, 1357, 1020,  463,
+     1348, 1021, 1495, 1006, 1006, 1006,  987,  463,  618,  618,
+      618,  618,  618,  618,  618,  618,  618,  618,  618,  463,
+      463,  618, 1014,  463,  618,  618,  618,  620,  618,  988,
+      988,  988, 1022, 1022, 1022, 1035, 1023, 1066,  463, 1024,
+     1493,  990,  990,  990,  989,  991,  618,  618,  992,  994,
+      994,  994, 1358,  995,  463, 1384,  996, 1036, 1036, 1036,
+     1008, 1008, 1008,  463, 1009, 1350, 1054, 1010, 1019, 1019,
+     1019, 1053, 1020,  463,  463, 1021,  620,  618,  618,  618,
+
+      618,  618, 1042,  618,  618,  618, 1048, 1360,  618,  463,
+     1351,  618,  618,  618,  620,  618,  476,  476,  476, 1022,
+     1022, 1022,  463, 1023, 1349,  463, 1024, 1371, 1057, 1057,
+     1057,  463,  478,  618,  618,  618,  618,  618,  618,  618,
+      618,  618,  618, 1042,  463,  463,  618, 1374, 1492,  618,
+      618,  618,  620,  618, 1061, 1061, 1061, 1036, 1036, 1036,
+      463,  463, 1044, 1068, 1068, 1068,  476,  476,  476, 1353,
+      463,  618,  618,  463, 1355, 1071, 1071, 1071, 1372,  620,
+      621,  463,  478, 1073, 1073, 1073, 1075, 1075, 1075, 1064,
+     1072, 1078, 1078, 1078, 1086, 1086, 1086, 1047, 1074,  463,
+
+     1388, 1076, 1494, 1057, 1057, 1057, 1079, 1167, 1167, 1167,
+      463, 1090, 1090, 1090, 1061, 1061, 1061,  463, 1070,  463,
+     1068, 1068, 1068, 1077,  476,  476,  476,  463, 1046,  463,
+      463,  463, 1071, 1071, 1071, 1088,  620, 1099, 1099, 1099,
+      478, 1100,  463, 1354, 1101,  463, 1092, 1072, 1073, 1073,
+     1073, 1102, 1102, 1102,  463, 1103,  463, 1389, 1104, 1075,
+     1075, 1075,  676, 1074, 1105, 1105, 1105, 1045, 1106, 1496,
+     1043, 1107, 1356, 1367, 1076, 1078, 1078, 1078,  463,  463,
+     1098, 1109, 1109, 1109,  463, 1110, 1368, 1378, 1111, 1375,
+     1079, 1086, 1086, 1086, 1090, 1090, 1090,  476,  476,  476,
+
+     1376, 1099, 1099, 1099, 1026, 1100,  463,  463, 1101, 1380,
+      463, 1379, 1382,  478, 1102, 1102, 1102, 1383, 1103,  463,
+     1025, 1104, 1018, 1118,  463, 1017, 1122, 1105, 1105, 1105,
+      463, 1106,  463, 1016, 1107, 1109, 1109, 1109, 1385, 1110,
+      463, 1015, 1111, 1130,  476,  476,  476, 1158, 1158, 1158,
+     1160, 1160, 1160, 1164, 1164, 1164,  476,  476,  476,  463,
+      478, 1403, 1390,  463, 1391, 1381,  463,  463,  463,  463,
+     1455, 1404,  478, 1158, 1158, 1158, 1013, 1177,  463,  463,
+     1178, 1160, 1160, 1160,  997, 1180,  463,  463, 1181,  463,
+      463, 1397, 1164, 1164, 1164, 1149, 1185,  463,  463, 1186,
+
+     1187, 1187, 1187, 1167, 1167, 1167, 1168, 1392,  463, 1189,
+     1189, 1189, 1191, 1191, 1191,  463,  463, 1187, 1187, 1187,
+     1386, 1210,  463, 1387, 1211, 1190, 1393, 1192, 1212, 1212,
+     1212, 1394,  463,  463, 1189, 1189, 1189, 1191, 1191, 1191,
+      993, 1213, 1213, 1213,  463, 1214,  463, 1398, 1215,  463,
+     1190,  985, 1192, 1223, 1223, 1223, 1228, 1228, 1228, 1212,
+     1212, 1212, 1399, 1233,  463, 1395, 1234,  463,  463,  463,
+      463, 1401,  463,  463, 1402,  463, 1213, 1213, 1213,  984,
+     1214, 1469,  983, 1215, 1237, 1237, 1237, 1223, 1223, 1223,
+      463, 1240,  982, 1407, 1241, 1244, 1244, 1244, 1408, 1405,
+
+      463, 1409, 1406,  463, 1400, 1228, 1228, 1228,  463, 1246,
+      463,  463, 1247, 1237, 1237, 1237,  463, 1256,  980, 1410,
+     1257,  463,  463, 1244, 1244, 1244,  463, 1264,  463,  463,
+     1265, 1338, 1338, 1338, 1340, 1340, 1340, 1497,  463,  463,
+     1352, 1352, 1352, 1338, 1338, 1338, 1339, 1411, 1413, 1341,
+     1361, 1361, 1361, 1412, 1362,  463,  463, 1363, 1339, 1340,
+     1340, 1340, 1364, 1364, 1364,  463, 1365,  463,  463, 1366,
+     1352, 1352, 1352, 1416, 1341, 1361, 1361, 1361, 1420, 1362,
+      463, 1417, 1363, 1364, 1364, 1364,  463, 1365,  463,  463,
+     1366,  463, 1418, 1419, 1424, 1421, 1425, 1414,  463,  463,
+
+     1430,  463, 1377,  463, 1431,  463,  463,  463,  463,  463,
+      463,  463,  463,  463, 1422,  463, 1423,  463,  463, 1442,
+     1442, 1442,  463, 1427, 1428, 1446, 1446, 1446,  463,  463,
+     1433, 1434,  463, 1436, 1437, 1443, 1455,  463, 1440,  463,
+     1441, 1447,  463, 1453, 1453, 1453,  463, 1448,  463,  463,
+     1438,  463, 1439, 1449, 1442, 1442, 1442, 1444, 1445, 1454,
+      463,  463, 1456,  463, 1457, 1446, 1446, 1446,  463, 1451,
+     1443,  463, 1452,  463, 1460, 1469, 1461, 1472, 1453, 1453,
+     1453, 1447, 1458, 1467, 1467, 1467, 1459,  463, 1465,  463,
+      463,  463,  959, 1466, 1454, 1472, 1470, 1476, 1471, 1468,
+
+     1462, 1463, 1476,  463,  463, 1475, 1475, 1475, 1479,  463,
+      463,  463, 1467, 1467, 1467, 1473, 1474, 1477, 1477, 1477,
+      463,  463, 1479, 1480, 1480, 1480, 1482, 1482, 1468,  955,
+     1498,  463,  463, 1478,  463,  954,  463,  951,  463, 1481,
+     1475, 1475, 1475,  463, 1483,  463,  463, 1484, 1485, 1485,
+     1485, 1477, 1477, 1477, 1499,  463,  463, 1487, 1487, 1487,
+     1480, 1480, 1480,  463, 1486, 1501, 1503, 1478, 1489, 1489,
+     1489, 1507,  463, 1488,  463, 1504, 1481, 1485, 1485, 1485,
+     1487, 1487, 1487, 1505, 1490, 1489, 1489, 1489, 1502, 1500,
+      463, 1506,  463, 1486,  463, 1513, 1488, 1508,  463, 1513,
+
+      946, 1490,  934, 1509, 1514, 1514, 1514,  463,  463, 1514,
+     1514, 1514,  933,  932, 1510,  929,  928, 1511,  927, 1512,
+     1515,  922,  909,  908,  904, 1515,  140,  140,  140,  140,
+      140,  140,  140,  141,  141,  141,  141,  141,  141,  141,
+      146,  146,  146,  146,  146,  146,  146,  149,  149,  149,
+      149,  149,  149,  149,  152,  152,  152,  152,  152,  152,
+      152,  155,  155,  155,  155,  155,  155,  155,  162,  162,
+      162,  162,  162,  162,  162,  170,  170,  170,  170,  170,
+      170,  170,  174,  174,  174,  174,  174,  174,  174,  193,
+      193,  193,  193,  193,  193,  193,  197,  197,  197,  197,
+
+      197,  197,  197,  203,  203,  203,  203,  203,  203,  203,
+      211,  211,  211,  211,  211,  211,  211,  219,  219,  219,
+      219,  219,  219,  219,  224,  224,  224,  224,  224,  224,
+      224,  230,  230,  230,  230,  230,  230,  230,  234,  234,
+      234,  234,  234,  234,  234,  240,  240,  240,  240,  240,
+      240,  240,  247,  247,  247,  247,  247,  247,  247,  254,
+      254,  254,  254,  254,  254,  254,  260,  260,  260,  260,
+      260,  260,  260,  268,  268,  268,  268,  268,  268,  268,
+      272,  272,  272,  272,  272,  272,  272,  278,  278,  278,
+      278,  278,  278,  278,  285,  285,  285,  285,  285,  285,
+
+      285,  294,  294,  294,  294,  294,  294,  294,  298,  298,
+      298,  298,  298,  298,  298,  155,  155,  155,  155,  155,
+      155,  155,  320,  320,  320,  903,  320,  331,  331,  331,
+      902,  331,  335,  335,  335,  898,  335,  345,  345,  345,
+      897,  345,  350,  350,  350,  896,  350,  354,  354,  354,
+      894,  354,  362,  362,  362,  871,  362,  369,  369,  369,
+      870,  369,  373,  373,  373,  869,  373,  381,  381,  381,
+      868,  381,  386,  386,  386,  386,  386,  867,  386,  401,
+      861,  401,  411,  860,  411,  420,  859,  420,  426,  858,
+      426,  430,  857,  430,  438,  855,  438,  443,  842,  443,
+
+      448,  834,  448,  454,  833,  454,  458,  832,  458,  462,
+      462,  462,  462,  462,  462,  462,  468,  831,  830,  468,
+      477,  477,  477,  477,  477,  477,  489,  489,  489,  489,
+      489,  489,  501,  501,  501,  501,  501,  501,  510,  510,
+      510,  510,  510,  510,  517,  517,  517,  517,  517,  517,
+      528,  528,  528,  528,  528,  528,  537,  537,  537,  537,
+      537,  537,  545,  545,  545,  545,  545,  545,  553,  553,
+      553,  553,  553,  553,  559,  559,  559,  559,  559,  559,
+      618,  618,  618,  618,  618,  618,  618, 1011, 1011, 1011,
+     1011, 1011, 1011, 1011, 1012, 1012, 1012, 1012, 1012, 1012,
+
+     1012, 1037, 1037, 1037, 1037, 1037, 1037, 1037, 1040, 1040,
+     1040, 1040, 1040, 1040, 1040, 1065, 1065, 1065, 1065, 1065,
+     1065, 1065, 1067, 1067, 1067, 1067, 1067, 1067, 1067,  829,
+      828,  827,  823,  822,  821,  820,  819,  818,  817,  816,
+      812,  808,  806,  804,  803,  799,  798,  797,  792,  791,
+      787,  784,  779,  778,  777,  769,  765,  763,  761,  760,
+      759,  757,  754,  753,  752,  751,  750,  746,  744,  743,
+      742,  741,  740,  739,  736,  735,  731,  727,  722,  720,
+      719,  718,  716,  714,  711,  707,  706,  705,  696,  689,
+      688,  687,  685,  683,  682,  680,  679,  678,  620,  674,
+
+      670,  668,  667,  663,  661,  659,  654,  653,  652,  640,
+      639,  638,  633,  632,  631,  630,  628,  625,  624,  623,
+      622,  616,  614,  613,  611,  610,  607,  605,  600,  595,
+      594,  593,  592,  589,  588,  586,  585,  584,  583,  582,
+      578,  577,  576,  575,  574,  573,  572,  570,  569,  568,
+      567,  566,  565,  564,  463,  562,  557,  556,  551,  550,
+      549,  548,  540,  533,  526,  525,  524,  520,  508,  504,
+      499,  498,  497,  496,  492,  487,  486,  485,  484,  483,
+      482,  481,  480,  475,  474,  473,  472,  471,  470,  469,
+      466,  464,  463,  461,  460,  459,  457,  456,  455,  453,
+
+      452,  451,  450,  449,  445,  444,  442,  441,  440,  439,
+      437,  436,  435,  432,  431,  427,  425,  422,  421,  419,
+      418,  417,  416,  413,  412,  410,  409,  408,  407,  406,
+      405,  404,  403,  402,  400,  399,  398,  397,  396,  395,
+      390,  387,  389,  385,  384,  382,  380,  377,  376,  375,
+      374,  372,  370,  368,  365,  364,  363,  361,  357,  356,
+      355,  353,  351,  349,  347,  346,  344,  341,  340,  339,
+      336,  334,  332,  330,  321,  319,  317,  311,  310,  311,
+      310,  309,  308, 1516,  139, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516
     } ;
 
-static yyconst flex_int16_t yy_chk[4212] =
+static yyconst flex_int16_t yy_chk[4349] =
     {   0,
         0,    3,    3,    3,    4,    4,    4,    5,    5,    5,
         6,    6,    6,    9,    0,    3,   10,   11,    4,   12,
-        9,    5,  337,   10,    6,    7,    7,    7,    8,    8,
-        8,   13,   13,   11,  337,   12,   13,   13,  257,    7,
-       14,   14,    8,  249,   13,   14,   14,   15,   15, 1036,
-       15,  104,   15,   14,   16,   16,  249,   16, 1036,   16,
-       15,   17,   17,   18,   18,  104,  105,   16,   19,   19,
+        9,    5, 1009,   10,    6,    7,    7,    7,    8,    8,
+        8,   13,   13,   11, 1009,   12,   13,   13,  312,    7,
+       14,   14,    8,  304,   13,   14,   14,   15,   15,  207,
+       15,  144,   15,   14,   16,   16,  304,   16,  207,   16,
+       15,   17,   17,   18,   18,  144,  145,   16,   19,   19,
        19,   20,   20,   20,   23,   23,   23,   24,   24,   24,
-      105,  258,   19,  272,  258,   20,  257,  650,   23,  272,
-      277,   24,  102,  102,  102,   17,  277,   18,   21,   21,
+      145,  148,   19,  171,  728,   20,  313,  312,   23,  313,
+      728,   24,  142,  142,  142,  148,   17,  171,   18,   21,
 
        21,   21,   21,   21,   21,   21,   21,   21,   21,   21,
-       21,  752,   21,   21,   21,   21,   21,   25,   25,   25,
-      650,   26,   26,   26,   27,   27,   27,   28,   28,   28,
-      340,   25,  340,   21,   21,   26,  108,  189,   27,  505,
-      131,   28,  103,  103,  103,  107,  107,  107,  189,  752,
-      108,  128,  128,  128,  131,  505,   21,   22,   22,   22,
+       21,   21, 1297,   21,   21,   21,   21,   21,   25,   25,
+       25,  388,  246,   26,   26,   26,   27,   27,   27,   28,
+       28,   28,   25,  246,  388,   21,   21,   26,  676,  391,
+       27,  391,  183,   28,  143,  143,  143,  147,  147,  147,
+      168,  168,  168,  175,  175,  175,  183,  729,   21,   22,
        22,   22,   22,   22,   22,   22,   22,   22,   22,   22,
-      803,   22,   22,   22,   22,   22,   29,   29,   29,  574,
-       30,   30,   30,   31,   31,   31,   32,   32,   32,  846,
-       29,  414,   22,   22,   30,  414,  574,   31,  651,  803,
-
-       32,  649,   33,   33,   33,   34,   34,   34,   35,   35,
-       35,   36,   36,   36,  649,   22,   33,  725,  126,   34,
-      705,  725,   35,  651,  846,   36,   37,   37,   37,   38,
-       38,   38,  126,  135,  135,  135,  143,  143,  143, 1307,
-       37,  926, 1306,   38,   39,   39,   39,   39,   39,   39,
-       39,   39,   39,   39,   39,   39,   39,  705,   39,   39,
-       39,   39,   39,   41,   41,   41,  126,   42,   42,   42,
-       43,   43,   43,  150,  150,  150,  703,   41,  704,   39,
-       39,   42,  703,  926,   43,  848,  751,   39,   40,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-
-       40,  704,   40,   40,   40,   40,   40,   44,   44,   44,
-      848,   47,   47,   47,   48,   48,   48,  154,  154,  154,
-      751,   44,  726,   40,   40,   47,  726, 1290,   48,  941,
-      941,   40,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   45,   45,   49,   49,   49,   50,   50,   50,
-
-      166,  166,  166,  170,  170,  170,  734,  888,   49, 1289,
-      734,   50,   51,   51,   51,   51,   51,   51,   51,   51,
-       51,   51,   51,   51,   51,  850,   51,   51,   51,   51,
-       51,   53,   53,   53,  888,   54,   54,   54,   55,   55,
-       55,   56,   56,   56,  146,   53,  151,   51,   51,   54,
-      735, 1273,   55,  151,  735,   56, 1066, 1066,  146,  850,
-      151,  802,   51,   52,   52,   52,   52,   52,   52,   52,
-       52,   52,   52,   52,   52,   52,  851,   52,   52,   52,
-       52,   52,   59,   59,   59,  802,   60,   60,   60,   61,
-       61,   61,   62,   62,   62,  157,   59,  167,   52,   52,
-
-       60, 1068,  852,   61,  167,  851,   62, 1272,  889,  157,
-     1068,  167, 1257,   52,   57,   57,   57,   57,   57,   57,
-       57,   57,   57,   57,   57,   57,   57,  893,   57,   57,
-       57,   57,   57,   65,   65,   65,  852,   66,   66,   66,
-       67,   67,   67,   68,   68,   68,  173,   65,  889,   57,
-       57,   66,  168,   57,   67,  845,  930,   68, 1256, 1050,
-      173,  893,   57, 1243,   57,  891,  168, 1050,  894,   57,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,  930,   58,   58,   58,   58,   58,   69,
-       69,   69,  845,   70,   70,   70,   71,   71,   71,   72,
-
-       72,   72,  168,   69,  891,   58,   58,   70,  894,   58,
-       71, 1242, 1035,   72,  177,  177,  177,  925,   58,  927,
-       58,  181,  181,  181, 1035,   58,   63,   63,   63,   63,
-       63,   63,   63,   63,   63,   63,   63,   63,   63,  955,
-       63,   63,   63,   63,   63,   73,   73,   73,  925,   74,
-       74,   74,   77,   77,   77,   78,   78,   78,  927,   73,
-      184,   63,   63,   74,  178,  198,   77,   63, 1225,   78,
-     1224,  178,   63,  955,  184,  191,  191,  191,  178,  198,
-      991,   63,   64,   64,   64,   64,   64,   64,   64,   64,
-       64,   64,   64,   64,   64,  849,   64,   64,   64,   64,
-
-       64,   79,   79,   79,  991,   80,   80,   80,   83,   83,
-       83,   84,   84,   84, 1116,   79,  990,   64,   64,   80,
-      192,  213,   83,   64, 1116,   84,  849,  192,   64,  195,
-      195,  195,  849,  990,  192,  213,  923,   64,   75,   75,
-       75,   75,   75,   75,   75,   75,   75,   75,   75,   75,
-       75,  892,   75,   75,   75,   75,   75,   85,   85,   85,
-     1059,   86,   86,   86,   87,   87,   87,   88,   88,   88,
-     1310,   85,  892,   75,   75,   86,  923, 1310,   87,  890,
-     1059,   88,  204,  204,  204,  210,  210,  210,   75,   76,
-       76,   76,   76,   76,   76,   76,   76,   76,   76,   76,
-
-       76,   76,  890,   76,   76,   76,   76,   76,   89,   89,
-       89,  928,   90,   90,   90,   91,   91,   91,   92,   92,
-       92,  193,   89,  179,   76,   76,   90, 1222,  954,   91,
-      952, 1311,   92,  929,  928,  193,  994,  179, 1311,   76,
-       81,   81,   81,   81,   81,   81,   81,   81,   81,   81,
-       81,   81,   81,  152,   81,   81,   81,   81,   81,   95,
-       95,   95,  952,   96,   96,   96,  224,  152,  954,  179,
-      219,  193,  929,   95,  994,   81,   81,   96,  208,  240,
-      224,   97,   97,   81,  219,   81,   97,   81,  118,  152,
-      992,  847,  208,  240,   97,   81,   82,   82,   82,   82,
-
-       82,   82,   82,   82,   82,   82,   82,   82,   82,  895,
-       82,   82,   82,   82,   82,   97,   98,   98,  219, 1026,
-      118,   98,  832,  141,  847, 1119,  118,  992,  208,   98,
-      118,   82,   82,  218, 1026,  118,  832,  141, 1173,   82,
-      218,   82,  895,   82,  217,  217,  217,  218, 1173, 1119,
-       98,   82,   93,   93,   93,   93,   93,   93,   93,   93,
-       93,   93,   93,   93,   93,  141,   93,   93,   93,   93,
-       93,  221,  221,  221,  231,  231,  231,  237,  237,  237,
-      244,  244,  244,  245,  248,  248,  248,   93,   93, 1220,
-      245,  350,  350,  350,  389,  389,  389,  245,  430,  430,
-
-      430,  436,  436,  436,  515,  515,  515,  350, 1029,  389,
-       93,   94,   94,   94,   94,   94,   94,   94,   94,   94,
-       94,   94,   94,   94,  136,   94,   94,   94,   94,   94,
-     1085,  136,  896,  956,  235, 1051, 1085,  137,  136,  351,
-      351,  351,  138, 1051,  137, 1029,   94,   94,  235, 1205,
-     1355,  137,  391,  391,  391,  351,  138, 1355,  136,  956,
-      136,  139,  443,  443,  443,  896,  136,  391,  235,   94,
-      136,  137,  136,  137,  136,  139,  138,  443,  138,  137,
-     1025,  957,  140,  137,  138,  137,  351,  137,  138,  140,
-      138,  205,  138, 1028, 1191,  139,  140,  139,  205, 1060,
-
-      206,  958, 1030,  139, 1204,  205,  957,  139, 1056,  139,
-      993,  139, 1203, 1025,  206,  207,  140, 1191,  140,  367,
-      367,  367,  207, 1028,  140,  205,  958,  205,  140,  207,
-      140, 1060,  140,  205,  206,  367,  206,  205,  232,  205,
-     1030,  205,  206,  989,  993,  232,  206, 1056,  206,  207,
-      206,  207,  232,  233,  375,  375,  375,  207,  451,  451,
-      451,  207,  234,  207, 1202,  207, 1201,  233,  989,  234,
-      375, 1171,  232,  451,  232, 1027,  234,  368,  368,  368,
-      232,  376,  376,  376,  232, 1063,  232,  233,  232,  233,
-      379,  379,  379,  368, 1062,  233,  234,  376,  234,  233,
-
-     1027,  233, 1032,  233,  234, 1091,  379, 1087,  234, 1171,
-      234, 1062,  234,  380,  380,  380, 1063,  386,  386,  386,
-      387,  387,  387,  392,  392,  392,  368, 1032, 1356,  380,
-     1091, 1118,  376,  386, 1122, 1356,  387, 1088, 1087,  392,
-      393,  393,  393,  397,  397,  397,  398,  398,  398,  403,
-      403,  403,  404,  404,  404, 1065,  393, 1088, 1153,  397,
-     1118,  387,  398,  380, 1153,  403, 1122, 1065,  404,  407,
-      407,  407,  408,  408,  408,  425,  425,  425,  426,  426,
-      426,  428,  428,  428, 1194,  407, 1170, 1200,  408, 1090,
-      393,  425, 1185, 1057,  426, 1184,  398,  428,  444,  444,
-
-      444,  445,  445,  445, 1090,  404,  447,  447,  447, 1057,
-      454,  454,  454, 1092,  444, 1187, 1170,  445,  428,  455,
-      455,  455,  447, 1194, 1188,  408,  454,  457,  457,  457,
-     1092,  459,  459,  459, 1117,  455,  460,  460,  460,  461,
-      461,  461, 1207,  457, 1195,  447,  459,  463,  463,  463,
-     1120, 1117,  460, 1187, 1195,  461,  466,  466,  466,  469,
-      469,  469, 1188,  463,  470,  470,  470, 1120,  472,  472,
-      472,  466,  474,  474,  474,  469,  477,  477,  477, 1123,
-      470, 1149, 1207,  457,  472, 1183, 1121,  474,  475,  475,
-      475,  477,  475, 1150, 1123,  475, 1149,  478,  478,  478,
-
-     1151,  478, 1121,  463,  478,  479,  479,  479,  480,  480,
-      480,  482,  482,  482,  485,  485,  485,  486,  486,  486,
-     1211,  479, 1175,  472,  480, 1151, 1150,  482, 1175,  485,
-      487,  487,  487,  486,  489,  489,  489,  491,  491,  491,
-      494,  494,  494,  495,  495,  495,  487,  497,  497,  497,
-      489, 1147,  491,  500,  500,  500,  494, 1211, 1245,  495,
-      501,  501,  501,  497,  503,  503,  503,  482, 1147,  500,
-      506,  506,  506,  513,  513,  513,  501,  521,  521,  521,
-      503,  528,  528,  528, 1245, 1182,  506,  506, 1189,  513,
-      489,  529,  529,  529, 1189,  529,  528,  497,  529,  530,
-
-      530,  530,  534,  534,  534, 1181, 1246,  503, 1192,  535,
-      535,  535, 1152,  535, 1192,  530,  535,  534,  536,  536,
-      536,  537,  537,  537,  538,  538,  538, 1152,  513,  540,
-      540,  540, 1246,  536, 1154, 1230,  537,  542,  542,  542,
-      538,  541,  541,  541,  540,  541,  530, 1155,  541,  545,
-      545,  545, 1230,  542,  546,  546,  546,  537,  546, 1154,
-     1169,  546, 1167, 1155,  545,  548,  548,  548,  549,  549,
-      549,  551,  551,  551, 1174,  551, 1169, 1167,  551, 1180,
-      548,  555,  555,  555,  549,  555, 1172, 1179,  555,  558,
-      558,  558,  542,  561,  561,  561,  562,  562,  562, 1231,
-
-      562,  548, 1172,  562, 1186,  558, 1208, 1174,  561,  563,
-      563,  563,  565,  565,  565,  566,  566,  566, 1206,  566,
-     1186, 1293,  566, 1276, 1206,  563,  549,  565, 1231,  569,
-      569,  569,  571,  571,  571,  572,  572,  572,  576,  576,
-      576,  583,  583,  583,  558,  569, 1208,  571,  589,  589,
-      589,  572, 1293, 1227,  576, 1276, 1228,  583,  591,  591,
-      591,  593,  593,  593,  563,  599,  599,  599,  569,  595,
-      595,  595, 1209,  596,  596,  596, 1277,  596, 1212,  576,
-      596,  599, 1209,  583,  589,  603,  603,  603, 1212,  603,
-     1227,  572,  603, 1228,  591,  576, 1166,  593,  606,  606,
-
-      606,  589,  607,  607,  607,  595,  607, 1315, 1277,  607,
-     1264,  591, 1253,  606,  593,  608,  608,  608,  611,  611,
-      611,  599,  595, 1226,  609,  609,  609, 1233,  609, 1253,
-      608,  609, 1280, 1226,  611,  614,  614,  614, 1280,  614,
-     1315, 1263,  614,  617,  617,  617,  620,  620,  620, 1264,
-      620, 1248, 1234,  620,  624,  624,  624, 1263, 1249,  617,
-      625,  625,  625, 1251,  625, 1233, 1248,  625, 1374,  624,
-      627,  627,  627,  628,  628,  628,  630,  630,  630,  631,
-      631,  631, 1267, 1252,  617, 1374,  627,  633,  633,  633,
-     1234,  633,  630, 1249,  633,  636,  636,  636,  638,  638,
-
-      638, 1269,  638, 1251, 1284,  638,  643,  643,  643, 1268,
-     1254,  636,  645,  645,  645,  631, 1269,  630, 1165, 1267,
-      627, 1281,  643, 1252,  646,  646,  646,  645,  646, 1259,
-     1284,  646,  631,  647,  647,  647,  636,  654,  654,  654,
-      655,  655,  655,  661,  661,  661, 1268,  643, 1254,  647,
-     1281, 1260,  654,  663,  663,  663,  655,  665,  665,  665,
-      667,  667,  667,  669,  669,  669,  673,  673,  673, 1255,
-      673, 1285, 1259,  673, 1164, 1304,  676,  676,  676,  669,
-      676,  647, 1270,  676,  680,  680,  680,  682,  682,  682,
-      655,  684,  684,  684, 1260,  684, 1261, 1285,  684, 1287,
-
-      680, 1304,  682,  669,  688,  688,  688, 1255,  690,  690,
-      690,  692,  692,  692,  696,  696,  696,  711,  711,  711,
-      688, 1381, 1270,  682,  690, 1163, 1286,  692, 1381, 1162,
-      696,  698,  698,  698, 1261,  698, 1287,  680,  698,  701,
-      701,  701, 1286,  707,  707,  707, 1161,  692, 1294,  708,
-      708,  708, 1262,  708, 1271,  701,  708,  688,  707,  709,
-      709,  709,  714,  714,  714,  716,  716,  716,  696,  718,
-      718,  718,  719,  719,  719,  709,  720,  720,  720, 1294,
-      701,  721,  721,  721,  728,  728,  728,  730,  730,  730,
-     1262,  731,  731,  731, 1271,  731, 1318,  721,  731, 1346,
-
-      728, 1265,  730,  737,  737,  737, 1278,  739,  739,  739,
-     1297, 1160,  709,  742,  742,  742,  743,  743,  743,  737,
-     1297, 1303,  721,  739,  746,  746,  746, 1303, 1318,  742,
-     1279,  743,  748,  748,  748,  750,  750,  750, 1346, 1265,
-      746, 1266, 1274,  754,  754,  754, 1278,  754,  748,  737,
-      754,  750, 1159, 1282,  742,  757,  757,  757,  758,  758,
-      758,  759,  759,  759,  762,  762,  762,  765,  765,  765,
-     1279,  757,  766,  766,  766,  767,  767,  767,  746, 1266,
-     1274,  748,  776,  776,  776,  778,  778,  778,  779,  779,
-      779,  767,  779, 1282, 1157,  779, 1146, 1145,  776, 1144,
-
-      778, 1275, 1385,  757,  789,  789,  789,  792,  792,  792,
-      793,  793,  793, 1283, 1385,  794,  794,  794, 1298,  794,
-      789,  778,  794,  792, 1305,  793,  795,  795,  795,  797,
-      797,  797,  798,  798,  798,  799,  799,  799, 1288, 1275,
-      789,  795,  805,  805,  805,  797,  806,  806,  806, 1291,
-     1305,  799, 1298, 1283,  792,  811,  811,  811,  805,  820,
-      820,  820,  821,  821,  821,  822,  822,  822, 1301,  822,
-     1143,  811,  822, 1292,  820, 1288, 1350,  821,  805,  830,
-      830,  830,  831,  831,  831,  834,  834,  834, 1295, 1291,
-      799,  801,  801,  801,  830,  835,  835,  835,  831,  835,
-
-     1296,  834,  835,  838,  838,  838, 1299,  801,  839,  839,
-      839, 1301,  839, 1292, 1350,  839, 1142, 1300,  838,  840,
-      840,  840,  841,  841,  841, 1295,  834, 1302,  801,  831,
-      801,  843,  843,  843,  840, 1308,  801, 1296,  841, 1312,
-      801, 1319,  801, 1299,  801,  844,  844,  844,  854,  854,
-      854,  864,  864,  864, 1300,  865,  865,  865, 1313,  865,
-     1316,  844,  865, 1309,  854, 1312,  864,  866,  866,  866,
-     1302,  866, 1308, 1319,  866,  874,  874,  874,  875,  875,
-      875, 1327,  875, 1317, 1313,  875, 1316, 1338,  854, 1335,
-      874,  876,  876,  876,  880,  880,  880,  881,  881,  881,
-
-     1309,  881, 1424, 1141,  881, 1327, 1137,  876, 1424, 1317,
-      880,  884,  884,  884,  885,  885,  885, 1321,  885, 1338,
-     1335,  885,  886,  886,  886, 1127,  884,  898,  898,  898,
-      903,  903,  903,  906,  906,  906,  876,  906,  886, 1325,
-      906, 1326,  880,  898, 1320,  903,  910,  910,  910,  912,
-      912,  912, 1328,  912, 1320, 1125,  912,  915,  915,  915,
-     1321,  910,  919,  919,  919, 1325,  903, 1326,  898, 1336,
-      920,  920,  920,  915,  920, 1124, 1328,  920,  919,  924,
-      924,  924,  931,  931,  931,  933,  933,  933,  934,  934,
-      934,  937,  937,  937, 1322,  924, 1339,  931,  931, 1348,
-
-     1336,  933, 1368,  919, 1114, 1369,  915,  938,  938,  938,
-      939,  939,  939, 1329,  939, 1347, 1407,  939,  944,  944,
-      944, 1113,  938,  945,  945,  945, 1368,  945, 1339, 1369,
-      945, 1348, 1407,  944,  947,  947,  947, 1322, 1330,  933,
-      948,  948,  948,  949,  949,  949,  951,  951,  951, 1394,
-      947,  953,  953,  953, 1347,  948, 1329, 1333,  949,  959,
-      959,  959,  951,  964,  964,  964, 1334,  953,  960,  960,
-      960,  966,  966,  966,  959,  959,  948, 1344, 1391,  949,
-      947, 1330,  953,  960,  960,  961,  961,  961, 1394,  961,
-     1345, 1349,  961, 1391, 1112,  951,  963,  963,  963, 1372,
-
-     1333,  961,  967,  967,  967, 1395,  968,  968,  968, 1334,
-      968, 1351,  963,  968,  975,  975,  975,  976,  976,  976,
-     1344,  976, 1414, 1349,  976,  979,  979,  979, 1353,  975,
-      980,  980,  980, 1345, 1354,  963,  981,  981,  981, 1372,
-      979,  982,  982,  982, 1395,  982,  980, 1415,  982, 1351,
-     1358,  981,  984,  984,  984,  985,  985,  985, 1373,  985,
-     1353, 1414,  985,  987,  987,  987, 1354,  984,  988,  988,
-      988,  995,  995,  995,  996,  996,  996, 1377,  997,  997,
-      997, 1358,  997, 1359,  988,  997, 1415,  995, 1427,  996,
-      996, 1004, 1004, 1004,  997,  998,  998,  998, 1373,  998,
-
-     1427, 1377,  998, 1002, 1002, 1002, 1366,  995, 1010, 1010,
-     1010,  998, 1010, 1378, 1359, 1010, 1023, 1023, 1023, 1002,
-     1009, 1009, 1009,  988,  995,  999,  999,  999,  999,  999,
-      999,  999,  999,  999, 1111, 1009,  999, 1378, 1366,  999,
-      999,  999,  999,  999, 1011, 1011, 1011, 1012, 1012, 1012,
-     1367, 1012, 1110, 1379, 1012, 1109, 1002, 1398, 1370, 1011,
-      999,  999, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000,
-     1000, 1380, 1371, 1000, 1375, 1376, 1000, 1000, 1000, 1000,
-     1000, 1398, 1367, 1013, 1013, 1013, 1015, 1015, 1015, 1370,
-     1015, 1379, 1383, 1015, 1024, 1024, 1024, 1000, 1000, 1013,
-
-     1019, 1019, 1019, 1371, 1019, 1375, 1376, 1019, 1384, 1380,
-     1024, 1031, 1031, 1031, 1033, 1033, 1033, 1034, 1034, 1034,
-     1106, 1034, 1382, 1383, 1034, 1387, 1420, 1031, 1386, 1382,
-     1033, 1389, 1387, 1034, 1046, 1046, 1046, 1386, 1046, 1384,
-     1390, 1046, 1031, 1037, 1037, 1037, 1037, 1037, 1037, 1037,
-     1037, 1037, 1399, 1412, 1037, 1445, 1099, 1037, 1037, 1037,
-     1037, 1037, 1049, 1049, 1049, 1420, 1049, 1445, 1389, 1049,
-     1176, 1176, 1176, 1040, 1040, 1040, 1399, 1390, 1037, 1037,
-     1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1040,
-     1412, 1038, 1388, 1392, 1038, 1038, 1038, 1038, 1038, 1388,
-
-     1392, 1054, 1054, 1054, 1058, 1058, 1058, 1061, 1061, 1061,
-     1064, 1064, 1064, 1428, 1393, 1038, 1038, 1054, 1040, 1097,
-     1058, 1393, 1428, 1061, 1405, 1095, 1064, 1070, 1070, 1070,
-     1072, 1072, 1072, 1074, 1074, 1074, 1075, 1075, 1075, 1396,
-     1400, 1064, 1401, 1070, 1070, 1397, 1072, 1400, 1074, 1401,
-     1405, 1075, 1076, 1076, 1076, 1077, 1077, 1077, 1084, 1084,
-     1084, 1086, 1086, 1086, 1089, 1089, 1089, 1076, 1406, 1403,
-     1077, 1096, 1096, 1096, 1084, 1094, 1422, 1086, 1404, 1396,
-     1089, 1072, 1098, 1098, 1098, 1397, 1408, 1096, 1076, 1100,
-     1100, 1100, 1086, 1403, 1406, 1089, 1093, 1409, 1098, 1101,
-
-     1101, 1101, 1404, 1101, 1100, 1410, 1101, 1102, 1102, 1102,
-     1408, 1413, 1096, 1103, 1103, 1103, 1083, 1103, 1411, 1422,
-     1103, 1409, 1102, 1104, 1104, 1104, 1105, 1105, 1105, 1410,
-     1105, 1451, 1423, 1105, 1107, 1107, 1107, 1098, 1104, 1108,
-     1108, 1108, 1411, 1108, 1416, 1421, 1108, 1429, 1413, 1107,
-     1115, 1115, 1115, 1126, 1126, 1126, 1128, 1128, 1128, 1417,
-     1128, 1082, 1451, 1128, 1081, 1430, 1115, 1080, 1416, 1126,
-     1131, 1131, 1131, 1429, 1131, 1423, 1437, 1131, 1134, 1134,
-     1134, 1115, 1134, 1417, 1421, 1134, 1138, 1138, 1138, 1079,
-     1138, 1430, 1431, 1138, 1148, 1148, 1148, 1439, 1126, 1158,
-
-     1158, 1158, 1168, 1168, 1168, 1438, 1168, 1439, 1437, 1168,
-     1148, 1177, 1177, 1177, 1452, 1158, 1431, 1446, 1168, 1178,
-     1178, 1178, 1190, 1190, 1190, 1078, 1446, 1177, 1193, 1193,
-     1193, 1196, 1196, 1196, 1197, 1197, 1197, 1438, 1190, 1198,
-     1198, 1198, 1425, 1493, 1193, 1452, 1199, 1199, 1199, 1158,
-     1197, 1210, 1210, 1210, 1432, 1213, 1213, 1213, 1073, 1213,
-     1177, 1199, 1213, 1214, 1214, 1214, 1071, 1210, 1215, 1215,
-     1215, 1213, 1216, 1216, 1216, 1218, 1218, 1218, 1432, 1214,
-     1493, 1425, 1210, 1426, 1215, 1219, 1219, 1219, 1216, 1219,
-     1218, 1069, 1219, 1229, 1229, 1229, 1232, 1232, 1232, 1235,
-
-     1235, 1235, 1433, 1236, 1236, 1236, 1464, 1236, 1435, 1229,
-     1236, 1434, 1232, 1464, 1436, 1235, 1237, 1237, 1237, 1236,
-     1237, 1449, 1426, 1237, 1244, 1244, 1244, 1247, 1247, 1247,
-     1235, 1247, 1435, 1449, 1247, 1250, 1250, 1250, 1436, 1250,
-     1244, 1433, 1250, 1247, 1494, 1258, 1258, 1258, 1440, 1258,
-     1434, 1250, 1258, 1314, 1314, 1314, 1323, 1323, 1323, 1067,
-     1458, 1258, 1324, 1324, 1324, 1441, 1331, 1331, 1331, 1314,
-     1331, 1323, 1440, 1331, 1332, 1332, 1332, 1324, 1337, 1337,
-     1337, 1494, 1331, 1340, 1340, 1340, 1342, 1342, 1342, 1441,
-     1332, 1443, 1458, 1444, 1337, 1341, 1341, 1341, 1340, 1341,
-
-     1450, 1342, 1341, 1343, 1343, 1343, 1053, 1343, 1454, 1450,
-     1343, 1352, 1352, 1352, 1357, 1357, 1357, 1052, 1357, 1468,
-     1454, 1357, 1360, 1360, 1360, 1447, 1360, 1352, 1448, 1360,
-     1357, 1363, 1363, 1363, 1443, 1363, 1444, 1459, 1363, 1402,
-     1402, 1402, 1352, 1418, 1418, 1418, 1442, 1442, 1442, 1447,
-     1468, 1455, 1448, 1045, 1044, 1402, 1453, 1453, 1453, 1418,
-     1455, 1461, 1442, 1456, 1456, 1456, 1460, 1460, 1460, 1459,
-     1465, 1462, 1453, 1461, 1463, 1463, 1463, 1465, 1469, 1456,
-     1462, 1477, 1460, 1475, 1466, 1466, 1466, 1478, 1466, 1476,
-     1463, 1466, 1467, 1467, 1467, 1470, 1470, 1470, 1485, 1486,
-
-     1466, 1472, 1472, 1472, 1473, 1473, 1473, 1475, 1467, 1469,
-     1487, 1470, 1488, 1476, 1479, 1479, 1479, 1472, 1489, 1477,
-     1473, 1481, 1482, 1495, 1490, 1478, 1496, 1491, 1481, 1482,
-     1479, 1483, 1483, 1483, 1492, 1498, 1501, 1485, 1486, 1502,
-     1499, 1497, 1489, 1500, 1498, 1504, 1505, 1483, 1490, 1506,
-     1487, 1491, 1488, 1497, 1503, 1503, 1503, 1043, 1492, 1507,
-     1501, 1506, 1495, 1502, 1510, 1496, 1499, 1511, 1507, 1500,
-     1503, 1508, 1508, 1508, 1512, 1512, 1512, 1513, 1514, 1515,
-     1515, 1515, 1519, 1520, 1517, 1518, 1521, 1508, 1504, 1505,
-     1512, 1517, 1518, 1522, 1523, 1515, 1510, 1524, 1525, 1511,
-
-     1042, 1041, 1526, 1527, 1527, 1527, 1519, 1520, 1513, 1514,
-     1525, 1526, 1528, 1528, 1528, 1039, 1022, 1018, 1523, 1527,
-     1008, 1524, 1007, 1006, 1005, 1521, 1003, 1001, 1528,  986,
-      983,  974, 1522, 1531, 1531, 1531, 1531, 1531, 1531, 1531,
-     1532, 1532, 1532, 1532, 1532, 1532, 1532, 1533, 1533, 1533,
-     1533, 1533, 1533, 1533, 1534, 1534, 1534, 1534, 1534, 1534,
-     1534, 1535, 1535, 1535, 1535, 1535, 1535, 1535, 1536, 1536,
-     1536, 1536, 1536, 1536, 1536, 1537, 1537, 1537, 1537, 1537,
-     1537, 1537, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1539,
-     1539, 1539, 1539, 1539, 1539, 1539, 1540, 1540, 1540, 1540,
-
-     1540, 1540, 1540, 1541, 1541, 1541, 1541, 1541, 1541, 1541,
-     1542, 1542, 1542, 1542, 1542, 1542, 1542, 1543, 1543, 1543,
-     1543, 1543, 1543, 1543, 1544, 1544, 1544, 1544, 1544, 1544,
-     1544, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1546, 1546,
-     1546, 1546, 1546, 1546, 1546, 1547, 1547, 1547, 1547, 1547,
-     1547, 1547, 1548, 1548, 1548, 1548, 1548, 1548, 1548, 1549,
-     1549, 1549, 1549, 1549, 1549, 1549, 1550, 1550, 1550, 1550,
-     1550, 1550, 1550, 1551, 1551, 1551, 1551, 1551, 1551, 1551,
-     1552, 1552, 1552, 1552, 1552, 1552, 1552, 1553, 1553, 1553,
-     1553, 1553, 1553, 1553, 1554, 1554, 1554, 1554, 1554, 1554,
-
-     1554, 1555, 1555, 1555,  973, 1555, 1556, 1556, 1556,  972,
-     1556, 1557, 1557, 1557,  971, 1557, 1558, 1558, 1558,  965,
-     1558, 1559, 1559, 1559,  962, 1559, 1560, 1560, 1560,  950,
-     1560, 1561, 1561, 1561,  946, 1561, 1562, 1562, 1562,  943,
-     1562, 1563, 1563, 1563,  942, 1563, 1564, 1564, 1564, 1564,
-     1564,  940, 1564, 1565,  936, 1565, 1566,  935, 1566, 1567,
-      932, 1567, 1568,  918, 1568, 1569,  917, 1569, 1570,  916,
-     1570, 1571,  911, 1571, 1572,  909, 1572, 1573,  905, 1573,
-     1574, 1574, 1574, 1574, 1574, 1574, 1574, 1575,  904,  902,
-     1575, 1576, 1576, 1576, 1576, 1576, 1576, 1577, 1577, 1577,
-
-     1577, 1577, 1577, 1578, 1578, 1578, 1578, 1578, 1578, 1579,
-     1579, 1579, 1579, 1579, 1579, 1580, 1580, 1580, 1580, 1580,
-     1580, 1581, 1581, 1581, 1581, 1581, 1581, 1582, 1582, 1582,
-     1582, 1582, 1582, 1583, 1583, 1583, 1583, 1583, 1583, 1584,
-     1584, 1584, 1584, 1584, 1584, 1585, 1585, 1585, 1585, 1585,
-     1585, 1585, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1587,
-     1587, 1587, 1587, 1587, 1587, 1587, 1588, 1588, 1588, 1588,
-     1588, 1588, 1588, 1589, 1589, 1589, 1589, 1589, 1589, 1589,
-     1590, 1590, 1590, 1590, 1590, 1590, 1590, 1591, 1591, 1591,
-     1591, 1591, 1591, 1591,  901,  900,  899,  897,  879,  878,
-
-      877,  871,  870,  869,  861,  860,  859,  858,  857,  856,
-      855,  853,  833,  828,  826,  825,  824,  823,  818,  816,
-      815,  814,  813,  810,  809,  808,  807,  804,  796,  791,
-      790,  788,  787,  786,  785,  784,  783,  782,  775,  774,
-      773,  772,  771,  770,  769,  768,  764,  763,  761,  760,
-      753,  749,  747,  745,  744,  741,  738,  736,  733,  732,
-      729,  727,  724,  723,  722,  717,  715,  713,  712,  710,
-      706,  702,  697,  695,  694,  693,  691,  689,  687,  686,
-      685,  683,  681,  679,  678,  677,  672,  671,  670,  668,
-      666,  664,  662,  660,  659,  658,  657,  656,  653,  648,
-
-      644,  642,  641,  637,  632,  629,  626,  623,  619,  618,
-      613,  610,  602,  601,  600,  594,  592,  590,  588,  587,
-      586,  585,  584,  582,  581,  578,  575,  573,  570,  568,
-      567,  564,  560,  559,  554,  550,  547,  544,  543,  539,
-      533,  532,  531,  527,  526,  525,  524,  523,  522,  520,
-      519,  518,  517,  516,  514,  512,  511,  510,  509,  504,
-      499,  498,  493,  492,  490,  484,  483,  476,  473,  468,
-      467,  465,  464,  458,  453,  452,  450,  449,  448,  442,
-      441,  440,  439,  438,  437,  435,  434,  433,  432,  431,
-      429,  424,  423,  422,  419,  418,  417,  415,  411,  409,
-
-      406,  405,  402,  401,  400,  399,  396,  395,  394,  390,
-      388,  385,  384,  383,  382,  381,  378,  377,  374,  373,
-      372,  371,  370,  369,  366,  365,  364,  363,  362,  361,
-      360,  359,  358,  357,  356,  355,  354,  353,  352,  349,
-      348,  346,  345,  344,  343,  342,  338,  336,  335,  334,
-      333,  332,  331,  328,  327,  326,  325,  324,  323,  320,
-      319,  318,  315,  314,  313,  312,  311,  310,  307,  306,
-      305,  304,  303,  302,  301,  298,  297,  294,  293,  292,
-      291,  290,  289,  288,  287,  284,  283,  280,  279,  278,
-      276,  275,  274,  273,  271,  270,  269,  268,  267,  266,
-
-      263,  262,  261,  260,  259,  253,  252,  250,  247,  246,
-      242,  238,  229,  228,  227,  226,  222,  215,  211,  202,
-      201,  200,  196,  188,  187,  186,  182,  175,  171,  164,
-      163,  162,  161,  160,  159,  155,  148,  144,  133,  129,
-      125,  124,  123,  117,  116,  114,  111,   99, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-
-     1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530,
-     1530
+       22,   22,  676,   22,   22,   22,   22,   22,   29,   29,
+       29,  729,  563,   30,   30,   30,   31,   31,   31,   32,
+       32,   32,   29,  183,  465,   22,   22,   30,  465,  563,
+
+       31,  810,  617,   32,  730,   33,   33,   33,   34,   34,
+       34,   35,   35,   35,   36,   36,   36, 1087,   22,   33,
+      617,  677,   34, 1087,  887,   35,  810,  180,   36,   37,
+       37,   37,   38,   38,   38,   39,   39,   39,   40,   40,
+       40,  180,  730,   37,  811,  742,   38,  677,  887,   39,
+      742,  185,   40,   41,   41,   41,   42,   42,   42,   43,
+       43,   43,   44,   44,   44,  185,  743,   41, 1296,  180,
+       42,  743, 1276,   43,  811,  194,   44,   45,   45,   45,
+       46,   46,   46,   47,   47,   47,   48,   48,   48,  194,
+      751,   45,  850,  752,   46,  751,  185,   47,  752,  204,
+
+       48,   49,   49,   49,   50,   50,   50,   51,   51,   51,
+       52,   52,   52,  204,  853,   49,  889,  970,   50,  927,
+      927,   51,  850,  220,   52,   53,   53,   53,   54,   54,
+       54,   55,   55,   55,   56,   56,   56,  220,  889,   53,
+      939,  970,   54,  885,  853,   55,  914,  166,   56,   57,
+       57,   57,   58,   58,   58,   59,   59,   59,   60,   60,
+       60,  166, 1275,   57,  916, 1255,   58,  939,  768,   59,
+      847,  885,   60,   61,   61,   61,   61,   61,   61,   61,
+       61,   61,   61,   61,   61,   61,  914,   61,   61,   61,
+       61,   61,   63,   63,   63,  916,  166,   64,   64,   64,
+
+       65,   65,   65,  191,  191,  191,   63,  768,  847,   61,
+       61,   64,  891,  999,   65,  968,  913,   61,   62,   62,
+       62,   62,   62,   62,   62,   62,   62,   62,   62,   62,
+       62,  999,   62,   62,   62,   62,   62,   66,   66,   66,
+      968,  767,   69,   69,   69,   70,   70,   70,  198,  198,
+      198,   66,  849,  891,   62,   62,   69,  913, 1254,   70,
+     1038, 1038,   62,   67,   67,   67,   67,   67,   67,   67,
+       67,   67,   67,   67,   67,   67,  767,   67,   67,   67,
+       67,   67,   71,   71,   71,  935,  849,   72,   72,   72,
+       73,   73,   73,   74,   74,   74,   71,  231,  189,   67,
+
+       67,   72,   67,  187,   73,  189, 1010,   74,  848, 1236,
+       67,  231,  189,   67,  920, 1010,   67,  187,  935,   67,
+       68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+       68,   68,   68,  851,   68,   68,   68,   68,   68,   75,
+       75,   75,  920,  848,   76,   76,   76,   77,   77,   77,
+       78,   78,   78,   75,  187,  199,   68,   68,   76,   68,
+      241,   77,  199, 1235,   78,  851, 1023,   68, 1219,  199,
+       68,  851,  917,   68,  241, 1023,   68,   79,   79,   79,
+       79,   79,   79,   79,   79,   79,   79,   79,   79,   79,
+      886,   79,   79,   79,   79,   79,   81,   81,   81, 1001,
+
+      852,   82,   82,   82,   83,   83,   83,   84,   84,   84,
+       81,  188,  917,   79,   79,   82,  177, 1001,   83, 1218,
+      255,   84, 1198, 1197,   79,  188,  201,  201,  201,  886,
+      177,  212,  212,  212,  255,  852,   79,   80,   80,   80,
+       80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
+      915,   80,   80,   80,   80,   80,   87,   87,   87,  177,
+      188,   88,   88,   88,   89,   89,   89,   90,   90,   90,
+       87,  214,  215,   80,   80,   88,  178, 1032,   89,  215,
+      269,   90,  915,  178,   80,  214,  215,  217,  217,  217,
+      178,  225,  225,  225,  269,  937,   80,   85,   85,   85,
+
+       85,   85,   85,   85,   85,   85,   85,   85,   85,   85,
+     1032,   85,   85,   85,   85,   85,   93,   93,   93,  178,
+      214,   94,   94,   94,   95,   95,   95,   96,   96,   96,
+       93, 1024,  854,   85,   85,   94,  937, 1089,   95,  919,
+     1024,   96,  940, 1089,   85,   86,   86,   86,   86,   86,
+       86,   86,   86,   86,   86,   86,   86,   86,  942,   86,
+       86,   86,   86,   86,   97,   97,   97,  854,  940,   98,
+       98,   98,   99,   99,   99,  100,  100,  100,   97,  919,
+      890,   86,   86,   98,  942, 1093,   99, 1195, 1005,  100,
+      966, 1093,   86,   91,   91,   91,   91,   91,   91,   91,
+
+       91,   91,   91,   91,   91,   91, 1005,   91,   91,   91,
+       91,   91,  101,  101,  101,  890,  966,  102,  102,  102,
+      105,  105,  105,  106,  106,  106,  101,  263,  971,   91,
+       91,  102,  226,   91,  105, 1193, 1037,  106, 1175,  226,
+       91,  263,   91,  228,  228,  228,  226, 1000, 1037,   91,
+       92,   92,   92,   92,   92,   92,   92,   92,   92,   92,
+       92,   92,   92,  971,   92,   92,   92,   92,   92,  107,
+      107,  107,  263, 1000,  108,  108,  108,  109,  109,  109,
+      110,  110,  110,  107,  279, 1174,   92,   92,  108,  236,
+       92,  109, 1003, 1407,  110,  888,  236,   92,  279,   92,
+
+      235,  235,  235,  236, 1028, 1407,   92,  103,  103,  103,
+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
+     1028,  103,  103,  103,  103,  103,  111,  111,  111,  888,
+     1003,  112,  112,  112,  113,  113,  113,  114,  114,  114,
+      111, 1040, 1173,  103,  103,  112, 1030,  295,  113,  103,
+     1040,  114,  892,  893,  103,  238,  238,  238,  248,  248,
+      248,  295, 1030,  103,  104,  104,  104,  104,  104,  104,
+      104,  104,  104,  104,  104,  104,  104,  972,  104,  104,
+      104,  104,  104,  117,  117,  117,  892,  893,  118,  118,
+      118,  119,  119,  119,  120,  120,  120,  117, 1408, 1034,
+
+      104,  104,  118,  250,  675,  119,  104, 1408,  120, 1091,
+      250,  104,  252,  252,  252, 1034,  972,  250,  675,  918,
+      104,  115,  115,  115,  115,  115,  115,  115,  115,  115,
+      115,  115,  115,  115, 1091,  115,  115,  115,  115,  115,
+      123,  123,  123,  918, 1056,  124,  124,  124,  125,  125,
+      125,  126,  126,  126,  123,  918, 1119,  115,  115,  124,
+     1172, 1056,  125, 1002, 1027,  126, 1063, 1119,  115,  116,
+      116,  116,  116,  116,  116,  116,  116,  116,  116,  116,
+      116,  116, 1063,  116,  116,  116,  116,  116,  127,  127,
+      127, 1004, 1058,  128,  128,  128,  129,  129,  129,  130,
+
+      130,  130,  127, 1002, 1027,  116,  116,  128, 1126, 1058,
+      129, 1200, 1171,  130, 1126, 1170,  116,  121,  121,  121,
+      121,  121,  121,  121,  121,  121,  121,  121,  121,  121,
+     1004,  121,  121,  121,  121,  121,  131,  131,  131, 1060,
+     1121,  132,  132,  132,  135,  135,  135,  261,  261,  261,
+      131, 1121, 1200,  121,  121,  132,  834,  179,  135, 1201,
+     1060,  121, 1143,  121,  179,  121,  158,  266,  266,  266,
+      834,  179, 1203,  121,  122,  122,  122,  122,  122,  122,
+      122,  122,  122,  122,  122,  122,  122, 1062,  122,  122,
+      122,  122,  122,  136,  136,  136,  273,  273,  273,  158,
+
+     1201, 1143,  179, 1156, 1062,  158,  179,  136,  179,  158,
+      122,  122,  184, 1203,  158, 1287,  137,  137,  122,  184,
+      122,  137,  122,  276,  276,  276,  184, 1094,  998,  137,
+      122,  133,  133,  133,  133,  133,  133,  133,  133,  133,
+      133,  133,  133,  133, 1094,  133,  133,  133,  133,  133,
+     1287,  137,  138,  138,  286,  286,  286,  138,  292,  292,
+      292,  184,  998,  184,  186,  138,  213,  133,  133,  176,
+      264,  186,  249,  213,  181,  274,  176,  264,  186,  249,
+      213,  181,  274,  176,  264, 1155,  249,  138,  181,  274,
+      133,  134,  134,  134,  134,  134,  134,  134,  134,  134,
+
+      134,  134,  134,  134, 1031,  134,  134,  134,  134,  134,
+      182,  176,  176,  186,  176,  213,  181,  182,  176,  181,
+      176,  249,  262,  181,  182,  181,  289,  134,  134,  262,
+      287,  288,  300,  289,  290, 1279,  262,  287, 1031,  300,
+      289,  299,  299,  299,  287,  288,  300, 1154,  290, 1123,
+      134,  303,  303,  303, 1095,  182,  337,  337,  337,  182,
+     1035,  182,  346,  346,  346,  287,  288,  262, 1279,  290,
+     1095,  337,  351,  351,  351, 1123, 1064,  346, 1035,  287,
+      288,  356,  356,  356,  370,  370,  370,  351,  401,  401,
+      401,  402,  402,  402, 1064, 1125,  356, 1088, 1120,  370,
+
+      411,  411,  411, 1092,  401, 1118, 1125,  402,  412,  412,
+      412,  414,  414,  414, 1120, 1088,  411, 1245,  415,  415,
+      415, 1092,  415, 1118,  412,  415,  414,  420,  420,  420,
+      421,  421,  421,  423,  423,  423,  426,  426,  426,  402,
+      424,  424,  424,  420,  424, 1127,  421,  424,  423,  427,
+      427,  427,  426,  428,  428,  428, 1146, 1245,  412,  429,
+      429,  429, 1127,  429, 1153,  427,  429, 1146,  428,  430,
+      430,  430,  431,  431,  431,  433,  433,  433,  438,  438,
+      438,  421,  434,  434,  434,  430,  434, 1162,  431,  434,
+      433,  439,  439,  439,  438,  440,  440,  440,  442,  442,
+
+      442, 1152, 1147,  427,  443,  443,  443,  439, 1147, 1122,
+      440, 1162, 1140,  442,  444,  444,  444,  446,  446,  446,
+      443, 1151, 1308,  431,  447,  447,  447, 1122,  447, 1140,
+      444,  447,  446,  448,  448,  448, 1144,  439,  449,  449,
+      449,  454,  454,  454,  455,  455,  455, 1166, 1124,  448,
+      458,  458,  458, 1144,  449, 1206, 1308,  454, 1166, 1157,
+      455,  459,  459,  459, 1124,  444,  458,  476,  476,  476,
+      477,  477,  477,  479,  479,  479, 1157,  459,  487,  487,
+      487, 1138, 1159,  476,  449, 1206,  477, 1150, 1159,  479,
+      488,  488,  488,  487,  489,  489,  489, 1138,  455, 1280,
+
+      491,  491,  491,  572,  572,  572,  488,  500,  500,  500,
+      489,  479,  501,  501,  501,  459,  491,  493,  493,  493,
+     1177,  493, 1183,  500,  493,  503,  503,  503,  501,  505,
+      505,  505, 1280,  505, 1204, 1142,  505,  509,  509,  509,
+      491,  503,  510,  510,  510,  512,  512,  512,  513,  513,
+      513, 1142,  513,  509, 1161,  513, 1178, 1137,  510, 1177,
+     1183,  512,  516,  516,  516,  517,  517,  517,  519,  519,
+      519, 1161,  521,  521,  521, 1204,  521, 1163,  516,  521,
+      503,  517, 1208, 1163,  519,  527,  527,  527,  528,  528,
+      528,  530,  530,  530, 1176, 1178,  512,  531,  531,  531,
+
+     1176,  527, 1182, 1179,  528, 1221, 1180,  530, 1182,  532,
+      532,  532,  531,  532, 1179, 1184,  532,  534,  534,  534,
+      535,  535,  535, 1208,  535,  519, 1184,  535,  536,  536,
+      536, 1199,  534,  537,  537,  537,  539,  539,  539, 1222,
+     1205,  530, 1199, 1221,  536, 1180,  541,  541,  541,  537,
+      541, 1205,  539,  541,  544,  544,  544,  545,  545,  545,
+      547,  547,  547,  549,  549,  549,  552,  552,  552, 1432,
+      544, 1224, 1181,  545, 1238, 1432,  547, 1222,  549,  553,
+      553,  553,  552,  555,  555,  555,  558,  558,  558,  559,
+      559,  559, 1225,  539, 1283,  553,  561,  561,  561,  555,
+
+     1227, 1238,  558, 1136, 1284,  559,  564,  564,  564, 1224,
+      547, 1181,  561,  571,  571,  571,  574,  574,  574,  588,
+      588,  588,  564,  564,  579,  579,  579, 1283, 1185,  571,
+     1225,  580,  580,  580,  555,  580, 1227, 1284,  580,  579,
+      561,  581,  581,  581,  585,  585,  585,  586,  586,  586,
+      587,  587,  587,  589,  589,  589, 1135,  581, 1239,  585,
+     1186, 1266,  586,  590,  590,  590,  587, 1185,  589,  571,
+      591,  591,  591,  595,  595,  595,  596,  596,  596,  590,
+      604,  604,  604, 1209,  586, 1239,  591, 1229,  595,  581,
+     1134, 1266,  596,  597,  597,  597,  604,  597, 1412, 1186,
+
+      597,  601,  601,  601, 1133,  601,  587, 1412,  601, 1132,
+      595,  606,  606,  606, 1230,  590,  608,  608,  608,  614,
+      614,  614, 1210,  596, 1209, 1229,  591,  606,  609,  609,
+      609,  608,  609, 1242,  614,  609,  604,  612,  612,  612,
+      615,  615,  615,  619,  619,  619,  626,  626,  626,  627,
+      627,  627, 1230,  612, 1131, 1129,  615, 1243,  606,  619,
+     1242, 1210,  626,  629,  629,  629,  631,  631,  631,  632,
+      632,  632,  634,  634,  634, 1231,  634,  612, 1232,  634,
+      637,  637,  637, 1250, 1243,  619,  647,  647,  647,  626,
+      641,  641,  641,  643,  643,  643,  637,  615,  648,  648,
+
+      648,  619,  642,  642,  642,  641,  642, 1117,  643,  642,
+      644,  644,  644,  648,  644, 1211, 1231,  644, 1248, 1232,
+      631, 1250,  646,  646,  646,  649,  649,  649, 1233,  649,
+     1252, 1344,  649,  650,  650,  650, 1116,  637,  646,  651,
+      651,  651,  655,  655,  655, 1248,  656,  656,  656,  650,
+      656, 1249, 1234,  656, 1211,  651, 1344,  655,  658,  658,
+      658,  660,  660,  660,  662,  662,  662, 1233,  664,  664,
+      664, 1252,  664, 1115,  658,  664,  662,  660, 1249, 1258,
+      662,  651,  669,  669,  669,  671,  671,  671,  672,  672,
+      672, 1234,  672, 1114, 1240,  672, 1241, 1246,  669, 1113,
+
+      671, 1377, 1247,  660,  673,  673,  673,  680,  680,  680,
+      681,  681,  681,  684,  684,  684,  685,  685,  685, 1377,
+      673, 1112,  680, 1258,  669, 1253,  681,  686,  686,  686,
+      690,  690,  690, 1240,  690, 1241, 1246,  690,  693,  693,
+      693, 1247,  693,  686, 1251,  693,  697,  697,  697, 1300,
+      699,  699,  699,  673,  699, 1415, 1260,  699,  702,  702,
+      702,  681,  697,  704,  704,  704, 1253, 1261,  686,  706,
+      706,  706, 1415, 1108,  702, 1097,  708,  708,  708,  704,
+      708, 1300, 1251,  708,  706,  712,  712,  712,  715,  715,
+      715,  717,  717,  717,  721,  721,  721, 1260,  723,  723,
+
+      723,  712,  723, 1267,  715,  723,  706,  717, 1261, 1411,
+      721,  726,  726,  726,  732,  732,  732,  704,  733,  733,
+      733, 1411,  733, 1268, 1256,  733, 1259,  726, 1257,  732,
+     1271,  717,  734,  734,  734,  735,  735,  735,  736,  736,
+      736,  737,  737,  737, 1267,  738,  738,  738,  734,  721,
+      745,  745,  745,  726,  747,  747,  747, 1271,  748,  748,
+      748,  738,  748, 1256, 1268,  748,  745, 1257, 1264,  747,
+     1259, 1273,  755,  755,  755,  758,  758,  758,  759,  759,
+      759,  762,  762,  762, 1096, 1321,  734,  738,  755, 1085,
+     1084,  758, 1321,  759,  764,  764,  764,  762,  766,  766,
+
+      766,  770,  770,  770, 1262,  770, 1263, 1264,  770, 1273,
+      764,  773,  773,  773,  766,  774,  774,  774,  775,  775,
+      775,  776,  776,  776,  785,  785,  785,  773,  787,  787,
+      787,  758,  799,  799,  799, 1265,  762,  776, 1083, 1345,
+      785, 1082, 1419,  787,  764,  788,  788,  788, 1262,  788,
+     1263, 1419,  788,  800,  800,  800,  801,  801,  801, 1274,
+      773,  803,  803,  803, 1345,  787,  802,  802,  802,  800,
+      802,  801, 1269,  802, 1265, 1281,  803,  805,  805,  805,
+      806,  806,  806,  807,  807,  807,  813,  813,  813,  814,
+      814,  814, 1270,  805,  823,  823,  823, 1274, 1081,  807,
+
+     1282, 1080,  813,  800, 1077,  814,  824,  824,  824,  823,
+      825,  825,  825, 1281,  825, 1288, 1269,  825,  833,  833,
+      833,  824, 1290,  813,  835,  835,  835,  836,  836,  836,
+      837,  837,  837,  833,  837, 1277, 1270,  837, 1282,  807,
+      809,  809,  809,  836,  840,  840,  840,  841,  841,  841,
+     1272,  841, 1278, 1288,  841, 1290,  809, 1289, 1450,  840,
+      842,  842,  842,  843,  843,  843,  845,  845,  845, 1450,
+     1285,  846,  846,  846, 1294,  842, 1277, 1272,  809,  843,
+      856,  856,  856, 1286, 1291,  809,  809,  846,  809,  862,
+      862,  862,  809, 1278,  809, 1289,  856, 1292,  863,  863,
+
+      863, 1294,  863, 1301,  862,  863,  864,  864,  864, 1295,
+      864, 1285, 1069,  864,  872,  872,  872, 1291,  873,  873,
+      873,  856,  873, 1293, 1286,  873,  876,  876,  876,  872,
+      878,  878,  878, 1483,  878, 1301, 1295,  878,  881,  881,
+      881, 1292,  876,  882,  882,  882, 1298,  882, 1067, 1299,
+      882, 1418, 1313,  881,  883,  883,  883,  895,  895,  895,
+      896,  896,  896, 1418,  899,  899,  899, 1293,  899, 1302,
+      883,  899, 1483,  895, 1315,  896,  903,  903,  903,  905,
+      905,  905, 1303,  905, 1298, 1313,  905, 1299,  910,  910,
+      910,  903,  910, 1306, 1066,  910, 1302,  896, 1304,  895,
+
+      921,  921,  921,  923,  923,  923,  924,  924,  924, 1303,
+      925,  925,  925, 1065,  925,  921,  921,  925, 1315,  923,
+     1305,  924,  930,  930,  930,  931,  931,  931, 1309,  931,
+     1304, 1306,  931,  933,  933,  933, 1054,  930,  934,  934,
+      934,  936,  936,  936,  938,  938,  938, 1053,  933,  941,
+      941,  941, 1305,  934, 1311, 1309,  938,  936,  923, 1307,
+      938,  943,  943,  943, 1316,  941,  944,  944,  944, 1310,
+      933, 1052,  947,  947,  947,  934,  943,  943,  974,  974,
+      974,  944,  944,  945,  945,  945, 1311,  945,  947, 1348,
+      945,  948,  948,  948,  974,  948, 1310, 1307,  948,  945,
+
+      955,  955,  955,  956,  956,  956, 1319,  956, 1316, 1312,
+      956, 1314,  947, 1051, 1348,  955,  959,  959,  959,  960,
+      960,  960,  961,  961,  961, 1323,  961, 1396, 1050,  961,
+     1336,  959,  974, 1319,  960,  963,  963,  963,  964,  964,
+      964, 1312,  964, 1396, 1314,  964,  967,  967,  967, 1049,
+      963,  969,  969,  969,  973,  973,  973,  975,  975,  975,
+     1320, 1324,  967, 1336,  976,  976,  976,  969,  976, 1323,
+      973,  976,  975,  975, 1322,  977,  977,  977,  967,  977,
+      976, 1322,  977,  969, 1493, 1334,  973, 1320,  981,  981,
+      981,  977,  978,  978,  978,  978,  978,  978,  978,  978,
+
+      978, 1043, 1041,  978,  981, 1324,  978,  978,  978,  978,
+      978,  986,  986,  986,  987,  987,  987, 1334,  987, 1491,
+     1325,  987, 1493, 1006, 1006, 1006,  986, 1325,  978,  978,
+      979,  979,  979,  979,  979,  979,  979,  979,  979, 1006,
+     1335,  979,  981, 1359,  979,  979,  979,  979,  979,  988,
+      988,  988,  989,  989,  989, 1006,  989, 1039, 1327,  989,
+     1491,  990,  990,  990,  988,  990,  979,  979,  990,  994,
+      994,  994, 1335,  994, 1337, 1359,  994, 1007, 1007, 1007,
+     1008, 1008, 1008, 1328, 1008, 1327, 1026, 1008, 1019, 1019,
+     1019, 1025, 1019, 1007, 1346, 1019, 1008, 1011, 1011, 1011,
+
+     1011, 1011, 1011, 1011, 1011, 1011, 1018, 1337, 1011, 1484,
+     1328, 1011, 1011, 1011, 1011, 1011, 1014, 1014, 1014, 1022,
+     1022, 1022, 1349, 1022, 1326, 1330, 1022, 1346, 1029, 1029,
+     1029, 1326, 1014, 1011, 1011, 1012, 1012, 1012, 1012, 1012,
+     1012, 1012, 1012, 1012, 1029, 1347, 1012, 1349, 1484, 1012,
+     1012, 1012, 1012, 1012, 1033, 1033, 1033, 1036, 1036, 1036,
+     1369, 1492, 1014, 1042, 1042, 1042, 1044, 1044, 1044, 1330,
+     1033, 1012, 1012, 1036, 1332, 1045, 1045, 1045, 1347, 1042,
+     1042, 1332, 1044, 1046, 1046, 1046, 1047, 1047, 1047, 1036,
+     1045, 1048, 1048, 1048, 1055, 1055, 1055, 1017, 1046, 1331,
+
+     1369, 1047, 1492, 1057, 1057, 1057, 1048, 1148, 1148, 1148,
+     1055, 1059, 1059, 1059, 1061, 1061, 1061, 1370, 1044, 1057,
+     1068, 1068, 1068, 1047, 1070, 1070, 1070, 1059, 1016, 1342,
+     1061, 1494, 1071, 1071, 1071, 1057, 1068, 1072, 1072, 1072,
+     1070, 1072, 1343, 1331, 1072, 1350, 1061, 1071, 1073, 1073,
+     1073, 1074, 1074, 1074, 1353, 1074, 1351, 1370, 1074, 1075,
+     1075, 1075, 1068, 1073, 1076, 1076, 1076, 1015, 1076, 1494,
+     1013, 1076, 1333, 1342, 1075, 1078, 1078, 1078, 1354, 1333,
+     1070, 1079, 1079, 1079, 1355, 1079, 1343, 1353, 1079, 1350,
+     1078, 1086, 1086, 1086, 1090, 1090, 1090, 1098, 1098, 1098,
+
+     1351, 1099, 1099, 1099,  997, 1099, 1360, 1086, 1099, 1355,
+     1090, 1354, 1357, 1098, 1102, 1102, 1102, 1358, 1102, 1357,
+      993, 1102,  985, 1086, 1358,  984, 1090, 1105, 1105, 1105,
+     1371, 1105, 1372,  983, 1105, 1109, 1109, 1109, 1360, 1109,
+     1356,  982, 1109, 1098, 1130, 1130, 1130, 1139, 1139, 1139,
+     1141, 1141, 1141, 1145, 1145, 1145, 1149, 1149, 1149, 1378,
+     1130, 1384, 1371, 1139, 1372, 1356, 1141, 1373, 1384, 1145,
+     1437, 1385, 1149, 1158, 1158, 1158,  980, 1158, 1385, 1437,
+     1158, 1160, 1160, 1160,  965, 1160, 1374, 1367, 1160, 1158,
+     1368, 1378, 1164, 1164, 1164, 1130, 1164, 1160, 1375, 1164,
+
+     1165, 1165, 1165, 1167, 1167, 1167, 1149, 1373, 1164, 1168,
+     1168, 1168, 1169, 1169, 1169, 1379, 1165, 1187, 1187, 1187,
+     1367, 1187, 1380, 1368, 1187, 1168, 1374, 1169, 1188, 1188,
+     1188, 1375, 1376, 1187, 1189, 1189, 1189, 1191, 1191, 1191,
+      962, 1192, 1192, 1192, 1188, 1192, 1382, 1379, 1192, 1383,
+     1189,  954, 1191, 1202, 1202, 1202, 1207, 1207, 1207, 1212,
+     1212, 1212, 1380, 1212, 1381, 1376, 1212, 1386, 1388, 1202,
+     1387, 1382, 1207, 1389, 1383, 1212, 1213, 1213, 1213,  953,
+     1213, 1457,  952, 1213, 1220, 1220, 1220, 1223, 1223, 1223,
+     1457, 1223,  951, 1388, 1223, 1226, 1226, 1226, 1389, 1386,
+
+     1220, 1390, 1387, 1223, 1381, 1228, 1228, 1228, 1390, 1228,
+     1495, 1226, 1228, 1237, 1237, 1237, 1394, 1237,  946, 1391,
+     1237, 1228, 1392, 1244, 1244, 1244, 1391, 1244, 1393, 1237,
+     1244, 1317, 1317, 1317, 1318, 1318, 1318, 1495, 1401, 1244,
+     1329, 1329, 1329, 1338, 1338, 1338, 1317, 1392, 1394, 1318,
+     1339, 1339, 1339, 1393, 1339, 1402, 1329, 1339, 1338, 1340,
+     1340, 1340, 1341, 1341, 1341, 1395, 1341, 1399, 1400, 1341,
+     1352, 1352, 1352, 1397, 1340, 1361, 1361, 1361, 1401, 1361,
+     1397, 1398, 1361, 1364, 1364, 1364, 1352, 1364, 1398, 1403,
+     1364, 1404, 1399, 1400, 1405, 1402, 1406, 1395, 1409, 1410,
+
+     1413, 1405, 1352, 1406, 1414, 1416, 1417, 1413, 1420, 1421,
+     1422, 1414, 1423, 1424, 1403, 1425, 1404, 1427, 1428, 1426,
+     1426, 1426, 1430, 1409, 1410, 1429, 1429, 1429, 1431, 1433,
+     1416, 1417, 1434, 1420, 1421, 1426, 1436, 1438, 1424, 1439,
+     1425, 1429, 1440, 1435, 1435, 1435, 1441, 1430, 1436, 1444,
+     1422, 1445, 1423, 1431, 1442, 1442, 1442, 1427, 1428, 1435,
+     1448, 1449, 1438, 1451, 1439, 1446, 1446, 1446, 1452, 1433,
+     1442, 1458, 1434, 1459, 1444, 1456, 1445, 1460, 1453, 1453,
+     1453, 1446, 1440, 1455, 1455, 1455, 1441, 1456, 1451, 1460,
+     1462, 1463,  932, 1452, 1453, 1461, 1458, 1465, 1459, 1455,
+
+     1448, 1449, 1466, 1496, 1461, 1464, 1464, 1464, 1470, 1465,
+     1497, 1466, 1467, 1467, 1467, 1462, 1463, 1469, 1469, 1469,
+     1470, 1464, 1471, 1472, 1472, 1472, 1473, 1474, 1467,  929,
+     1496, 1471, 1499, 1469, 1501,  928, 1474,  926, 1473, 1472,
+     1475, 1475, 1475, 1502, 1475, 1498, 1505, 1475, 1476, 1476,
+     1476, 1477, 1477, 1477, 1497, 1500, 1475, 1479, 1479, 1479,
+     1480, 1480, 1480, 1507, 1476, 1499, 1501, 1477, 1482, 1482,
+     1482, 1505, 1506, 1479, 1508, 1502, 1480, 1485, 1485, 1485,
+     1487, 1487, 1487, 1503, 1482, 1489, 1489, 1489, 1500, 1498,
+     1503, 1504, 1509, 1485, 1510, 1511, 1487, 1506, 1504, 1512,
+
+      922, 1489,  909, 1507, 1513, 1513, 1513, 1511, 1512, 1514,
+     1514, 1514,  908,  904, 1508,  902,  898, 1509,  897, 1510,
+     1513,  894,  875,  874,  869, 1514, 1517, 1517, 1517, 1517,
+     1517, 1517, 1517, 1518, 1518, 1518, 1518, 1518, 1518, 1518,
+     1519, 1519, 1519, 1519, 1519, 1519, 1519, 1520, 1520, 1520,
+     1520, 1520, 1520, 1520, 1521, 1521, 1521, 1521, 1521, 1521,
+     1521, 1522, 1522, 1522, 1522, 1522, 1522, 1522, 1523, 1523,
+     1523, 1523, 1523, 1523, 1523, 1524, 1524, 1524, 1524, 1524,
+     1524, 1524, 1525, 1525, 1525, 1525, 1525, 1525, 1525, 1526,
+     1526, 1526, 1526, 1526, 1526, 1526, 1527, 1527, 1527, 1527,
+
+     1527, 1527, 1527, 1528, 1528, 1528, 1528, 1528, 1528, 1528,
+     1529, 1529, 1529, 1529, 1529, 1529, 1529, 1530, 1530, 1530,
+     1530, 1530, 1530, 1530, 1531, 1531, 1531, 1531, 1531, 1531,
+     1531, 1532, 1532, 1532, 1532, 1532, 1532, 1532, 1533, 1533,
+     1533, 1533, 1533, 1533, 1533, 1534, 1534, 1534, 1534, 1534,
+     1534, 1534, 1535, 1535, 1535, 1535, 1535, 1535, 1535, 1536,
+     1536, 1536, 1536, 1536, 1536, 1536, 1537, 1537, 1537, 1537,
+     1537, 1537, 1537, 1538, 1538, 1538, 1538, 1538, 1538, 1538,
+     1539, 1539, 1539, 1539, 1539, 1539, 1539, 1540, 1540, 1540,
+     1540, 1540, 1540, 1540, 1541, 1541, 1541, 1541, 1541, 1541,
+
+     1541, 1542, 1542, 1542, 1542, 1542, 1542, 1542, 1543, 1543,
+     1543, 1543, 1543, 1543, 1543, 1544, 1544, 1544, 1544, 1544,
+     1544, 1544, 1545, 1545, 1545,  868, 1545, 1546, 1546, 1546,
+      867, 1546, 1547, 1547, 1547,  859, 1547, 1548, 1548, 1548,
+      858, 1548, 1549, 1549, 1549,  857, 1549, 1550, 1550, 1550,
+      855, 1550, 1551, 1551, 1551,  831, 1551, 1552, 1552, 1552,
+      829, 1552, 1553, 1553, 1553,  828, 1553, 1554, 1554, 1554,
+      827, 1554, 1555, 1555, 1555, 1555, 1555,  826, 1555, 1556,
+      821, 1556, 1557,  819, 1557, 1558,  818, 1558, 1559,  817,
+     1559, 1560,  816, 1560, 1561,  812, 1561, 1562,  804, 1562,
+
+     1563,  798, 1563, 1564,  797, 1564, 1565,  796, 1565, 1566,
+     1566, 1566, 1566, 1566, 1566, 1566, 1567,  795,  794, 1567,
+     1568, 1568, 1568, 1568, 1568, 1568, 1569, 1569, 1569, 1569,
+     1569, 1569, 1570, 1570, 1570, 1570, 1570, 1570, 1571, 1571,
+     1571, 1571, 1571, 1571, 1572, 1572, 1572, 1572, 1572, 1572,
+     1573, 1573, 1573, 1573, 1573, 1573, 1574, 1574, 1574, 1574,
+     1574, 1574, 1575, 1575, 1575, 1575, 1575, 1575, 1576, 1576,
+     1576, 1576, 1576, 1576, 1577, 1577, 1577, 1577, 1577, 1577,
+     1578, 1578, 1578, 1578, 1578, 1578, 1578, 1579, 1579, 1579,
+     1579, 1579, 1579, 1579, 1580, 1580, 1580, 1580, 1580, 1580,
+
+     1580, 1581, 1581, 1581, 1581, 1581, 1581, 1581, 1582, 1582,
+     1582, 1582, 1582, 1582, 1582, 1583, 1583, 1583, 1583, 1583,
+     1583, 1583, 1584, 1584, 1584, 1584, 1584, 1584, 1584,  793,
+      792,  791,  784,  783,  782,  781,  780,  779,  778,  777,
+      769,  765,  763,  761,  760,  757,  754,  753,  750,  749,
+      746,  744,  741,  740,  739,  731,  727,  722,  720,  719,
+      718,  716,  714,  711,  710,  709,  707,  705,  696,  695,
+      694,  689,  688,  687,  683,  682,  679,  674,  670,  668,
+      667,  663,  661,  659,  657,  654,  653,  652,  645,  640,
+      639,  638,  633,  630,  628,  625,  624,  621,  618,  616,
+
+      613,  611,  610,  607,  605,  600,  594,  593,  592,  584,
+      583,  582,  578,  577,  576,  575,  573,  570,  569,  568,
+      567,  562,  557,  556,  551,  550,  548,  540,  533,  526,
+      525,  524,  520,  508,  504,  499,  498,  497,  496,  492,
+      486,  485,  484,  483,  482,  481,  480,  475,  474,  473,
+      470,  469,  468,  466,  462,  460,  457,  456,  453,  452,
+      451,  450,  445,  441,  437,  436,  435,  432,  425,  422,
+      419,  418,  417,  416,  413,  410,  409,  408,  407,  406,
+      405,  404,  403,  400,  399,  397,  396,  395,  394,  393,
+      389,  387,  386,  385,  384,  383,  382,  379,  378,  377,
+
+      376,  375,  374,  371,  367,  366,  365,  364,  363,  360,
+      359,  358,  357,  355,  352,  348,  347,  343,  342,  341,
+      340,  339,  338,  336,  333,  332,  329,  328,  327,  326,
+      325,  324,  323,  322,  321,  318,  317,  316,  315,  314,
+      308,  307,  305,  302,  301,  297,  293,  284,  283,  282,
+      281,  277,  271,  267,  259,  258,  257,  253,  245,  244,
+      243,  239,  233,  229,  223,  222,  218,  210,  209,  208,
+      206,  202,  196,  192,  173,  169,  165,  164,  163,  157,
+      156,  154,  151,  139, 1516, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516,
+     1516, 1516, 1516, 1516, 1516, 1516, 1516, 1516
     } ;
 
 /* Table of booleans, true if rule could match eol. */
-static yyconst flex_int32_t yy_rule_can_match_eol[199] =
+static yyconst flex_int32_t yy_rule_can_match_eol[203] =
     {   0,
 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-    1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 
-    0, 0, 0, 1, 1, 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, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 
-    1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 
-    1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 
-    0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0,     };
+    1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 
+    0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
+    1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 
+    0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 
+    0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 
+    0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 
+    1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 
+    0, 1, 0,     };
 
 static yy_state_type yy_last_accepting_state;
 static char *yy_last_accepting_cpos;
@@ -1928,12 +1952,12 @@ int surf_parse__flex_debug = 0;
 #define YY_RESTORE_YY_MORE_OFFSET
 char *surf_parse_text;
 /* Validating XML processor for surf/surfxml.dtd.
- * Generated 2007/10/12 10:23:15.
+ * Generated 2007/10/23 11:08:07.
  *
  * This program was generated with the FleXML XML processor generator.
  * FleXML is Copyright (C) 1999-2005 Kristoffer Rose.  All rights reserved.
  * FleXML is Copyright (C) 2003-2006 Martin Quinson.  All rights reserved.
- * (Id: flexml.pl,v 1.62 2007/10/11 10:00:14 mquinson Exp).
+ * (Id: flexml.pl,v 1.61 2006/09/13 16:34:33 wdowling Exp).
  * 
  * There are two, intertwined parts to this program, part A and part B.
  *
@@ -1976,27 +2000,25 @@ char *surf_parse_text;
 
 /* Version strings. */
 const char rcs_surfxml_flexml_skeleton[] =
- "$" "Id: skel,v 1.40 2007/10/11 09:57:24 mquinson Exp $";
+ "$" "Id: skel,v 1.38 2006/09/12 18:05:45 wdowling Exp $";
 const char rcs_surfxml_flexml[] =
- "$" "Id: flexml.pl,v 1.62 2007/10/11 10:00:14 mquinson Exp $";
+ "$" "Id: flexml.pl,v 1.61 2006/09/13 16:34:33 wdowling Exp $";
 
 /* ANSI headers. */
-#include <stdlib.h> /* for realloc() -- needed here when using flex 2.5.4 */
+#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)
+#  ifndef __STRICT_ANSI__
+#    include <io.h>
+#    include <process.h>
+#  endif
+#else
+#  include <unistd.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 #include <stdarg.h>
 #include <ctype.h>
-     
-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)
-# ifndef __STRICT_ANSI__
-#  include <io.h>
-#  include <process.h>
-# endif
-#else
-# include <unistd.h>
-#endif
-     
+
 #ifndef FLEXML_INDEXSTACKSIZE
 #define FLEXML_INDEXSTACKSIZE 1000
 #endif
@@ -2013,72 +2035,76 @@ const char rcs_surfxml_flexml[] =
 int surfxml_pcdata_ix;
 extern char *surfxml_bufferstack;
 #define surfxml_pcdata (surfxml_bufferstack + surfxml_pcdata_ix)
-AT_surfxml_network_link_bandwidth AX_surfxml_network_link_bandwidth;
-#define A_surfxml_network_link_bandwidth (surfxml_bufferstack + AX_surfxml_network_link_bandwidth)
-AT_surfxml_router_name AX_surfxml_router_name;
-#define A_surfxml_router_name (surfxml_bufferstack + AX_surfxml_router_name)
+AT_surfxml_link_id AX_surfxml_link_id;
+#define A_surfxml_link_id (surfxml_bufferstack + AX_surfxml_link_id)
+AT_surfxml_prop_id AX_surfxml_prop_id;
+#define A_surfxml_prop_id (surfxml_bufferstack + AX_surfxml_prop_id)
+AT_surfxml_host_interference_recv AX_surfxml_host_interference_recv;
+#define A_surfxml_host_interference_recv (surfxml_bufferstack + AX_surfxml_host_interference_recv)
+AT_surfxml_host_id AX_surfxml_host_id;
+#define A_surfxml_host_id (surfxml_bufferstack + AX_surfxml_host_id)
+AT_surfxml_link_latency_file AX_surfxml_link_latency_file;
+#define A_surfxml_link_latency_file (surfxml_bufferstack + AX_surfxml_link_latency_file)
 AT_surfxml_process_host AX_surfxml_process_host;
 #define A_surfxml_process_host (surfxml_bufferstack + AX_surfxml_process_host)
-AT_surfxml_network_link_latency_file AX_surfxml_network_link_latency_file;
-#define A_surfxml_network_link_latency_file (surfxml_bufferstack + AX_surfxml_network_link_latency_file)
+AT_surfxml_host_availability_file AX_surfxml_host_availability_file;
+#define A_surfxml_host_availability_file (surfxml_bufferstack + AX_surfxml_host_availability_file)
+AT_surfxml_host_state AX_surfxml_host_state;
+#define A_surfxml_host_state AX_surfxml_host_state
+AT_surfxml_host_interference_send_recv AX_surfxml_host_interference_send_recv;
+#define A_surfxml_host_interference_send_recv (surfxml_bufferstack + AX_surfxml_host_interference_send_recv)
 AT_surfxml_route_impact_on_dst_with_other_send AX_surfxml_route_impact_on_dst_with_other_send;
 #define A_surfxml_route_impact_on_dst_with_other_send (surfxml_bufferstack + AX_surfxml_route_impact_on_dst_with_other_send)
-AT_surfxml_cpu_interference_send_recv AX_surfxml_cpu_interference_send_recv;
-#define A_surfxml_cpu_interference_send_recv (surfxml_bufferstack + AX_surfxml_cpu_interference_send_recv)
+AT_surfxml_host_interference_send AX_surfxml_host_interference_send;
+#define A_surfxml_host_interference_send (surfxml_bufferstack + AX_surfxml_host_interference_send)
 AT_surfxml_route_impact_on_dst AX_surfxml_route_impact_on_dst;
 #define A_surfxml_route_impact_on_dst (surfxml_bufferstack + AX_surfxml_route_impact_on_dst)
 AT_surfxml_platform_description_version AX_surfxml_platform_description_version;
 #define A_surfxml_platform_description_version (surfxml_bufferstack + AX_surfxml_platform_description_version)
+AT_surfxml_prop_value AX_surfxml_prop_value;
+#define A_surfxml_prop_value (surfxml_bufferstack + AX_surfxml_prop_value)
 AT_surfxml_route_impact_on_src_with_other_recv AX_surfxml_route_impact_on_src_with_other_recv;
 #define A_surfxml_route_impact_on_src_with_other_recv (surfxml_bufferstack + AX_surfxml_route_impact_on_src_with_other_recv)
-AT_surfxml_route_element_name AX_surfxml_route_element_name;
-#define A_surfxml_route_element_name (surfxml_bufferstack + AX_surfxml_route_element_name)
+AT_surfxml_host_power AX_surfxml_host_power;
+#define A_surfxml_host_power (surfxml_bufferstack + AX_surfxml_host_power)
+AT_surfxml_link_state_file AX_surfxml_link_state_file;
+#define A_surfxml_link_state_file (surfxml_bufferstack + AX_surfxml_link_state_file)
+AT_surfxml_router_id AX_surfxml_router_id;
+#define A_surfxml_router_id (surfxml_bufferstack + AX_surfxml_router_id)
 AT_surfxml_process_start_time AX_surfxml_process_start_time;
 #define A_surfxml_process_start_time (surfxml_bufferstack + AX_surfxml_process_start_time)
 AT_surfxml_process_function AX_surfxml_process_function;
 #define A_surfxml_process_function (surfxml_bufferstack + AX_surfxml_process_function)
-AT_surfxml_cpu_state AX_surfxml_cpu_state;
-#define A_surfxml_cpu_state AX_surfxml_cpu_state
-AT_surfxml_cpu_interference_send AX_surfxml_cpu_interference_send;
-#define A_surfxml_cpu_interference_send (surfxml_bufferstack + AX_surfxml_cpu_interference_send)
-AT_surfxml_network_link_bandwidth_file AX_surfxml_network_link_bandwidth_file;
-#define A_surfxml_network_link_bandwidth_file (surfxml_bufferstack + AX_surfxml_network_link_bandwidth_file)
-AT_surfxml_cpu_name AX_surfxml_cpu_name;
-#define A_surfxml_cpu_name (surfxml_bufferstack + AX_surfxml_cpu_name)
+AT_surfxml_host_max_outgoing_rate AX_surfxml_host_max_outgoing_rate;
+#define A_surfxml_host_max_outgoing_rate (surfxml_bufferstack + AX_surfxml_host_max_outgoing_rate)
+AT_surfxml_link_sharing_policy AX_surfxml_link_sharing_policy;
+#define A_surfxml_link_sharing_policy AX_surfxml_link_sharing_policy
+AT_surfxml_link_c_ctn_id AX_surfxml_link_c_ctn_id;
+#define A_surfxml_link_c_ctn_id (surfxml_bufferstack + AX_surfxml_link_c_ctn_id)
 AT_surfxml_process_kill_time AX_surfxml_process_kill_time;
 #define A_surfxml_process_kill_time (surfxml_bufferstack + AX_surfxml_process_kill_time)
-AT_surfxml_network_link_state AX_surfxml_network_link_state;
-#define A_surfxml_network_link_state AX_surfxml_network_link_state
-AT_surfxml_cpu_availability_file AX_surfxml_cpu_availability_file;
-#define A_surfxml_cpu_availability_file (surfxml_bufferstack + AX_surfxml_cpu_availability_file)
+AT_surfxml_host_availability AX_surfxml_host_availability;
+#define A_surfxml_host_availability (surfxml_bufferstack + AX_surfxml_host_availability)
 AT_surfxml_argument_value AX_surfxml_argument_value;
 #define A_surfxml_argument_value (surfxml_bufferstack + AX_surfxml_argument_value)
+AT_surfxml_link_state AX_surfxml_link_state;
+#define A_surfxml_link_state AX_surfxml_link_state
 AT_surfxml_route_src AX_surfxml_route_src;
 #define A_surfxml_route_src (surfxml_bufferstack + AX_surfxml_route_src)
 AT_surfxml_route_impact_on_src AX_surfxml_route_impact_on_src;
 #define A_surfxml_route_impact_on_src (surfxml_bufferstack + AX_surfxml_route_impact_on_src)
-AT_surfxml_cpu_max_outgoing_rate AX_surfxml_cpu_max_outgoing_rate;
-#define A_surfxml_cpu_max_outgoing_rate (surfxml_bufferstack + AX_surfxml_cpu_max_outgoing_rate)
-AT_surfxml_cpu_availability AX_surfxml_cpu_availability;
-#define A_surfxml_cpu_availability (surfxml_bufferstack + AX_surfxml_cpu_availability)
-AT_surfxml_cpu_interference_recv AX_surfxml_cpu_interference_recv;
-#define A_surfxml_cpu_interference_recv (surfxml_bufferstack + AX_surfxml_cpu_interference_recv)
-AT_surfxml_network_link_name AX_surfxml_network_link_name;
-#define A_surfxml_network_link_name (surfxml_bufferstack + AX_surfxml_network_link_name)
-AT_surfxml_cpu_power AX_surfxml_cpu_power;
-#define A_surfxml_cpu_power (surfxml_bufferstack + AX_surfxml_cpu_power)
+AT_surfxml_link_bandwidth AX_surfxml_link_bandwidth;
+#define A_surfxml_link_bandwidth (surfxml_bufferstack + AX_surfxml_link_bandwidth)
+AT_surfxml_link_latency AX_surfxml_link_latency;
+#define A_surfxml_link_latency (surfxml_bufferstack + AX_surfxml_link_latency)
 AT_surfxml_include_file AX_surfxml_include_file;
 #define A_surfxml_include_file (surfxml_bufferstack + AX_surfxml_include_file)
-AT_surfxml_network_link_sharing_policy AX_surfxml_network_link_sharing_policy;
-#define A_surfxml_network_link_sharing_policy AX_surfxml_network_link_sharing_policy
+AT_surfxml_link_bandwidth_file AX_surfxml_link_bandwidth_file;
+#define A_surfxml_link_bandwidth_file (surfxml_bufferstack + AX_surfxml_link_bandwidth_file)
+AT_surfxml_host_state_file AX_surfxml_host_state_file;
+#define A_surfxml_host_state_file (surfxml_bufferstack + AX_surfxml_host_state_file)
 AT_surfxml_route_dst AX_surfxml_route_dst;
 #define A_surfxml_route_dst (surfxml_bufferstack + AX_surfxml_route_dst)
-AT_surfxml_network_link_latency AX_surfxml_network_link_latency;
-#define A_surfxml_network_link_latency (surfxml_bufferstack + AX_surfxml_network_link_latency)
-AT_surfxml_cpu_state_file AX_surfxml_cpu_state_file;
-#define A_surfxml_cpu_state_file (surfxml_bufferstack + AX_surfxml_cpu_state_file)
-AT_surfxml_network_link_state_file AX_surfxml_network_link_state_file;
-#define A_surfxml_network_link_state_file (surfxml_bufferstack + AX_surfxml_network_link_state_file)
 
 /* XML state. */
 #ifdef FLEX_DEBUG
@@ -2234,38 +2260,58 @@ const char* *surfxml_statenames=NULL;
 #define S_surfxml_platform_description_3 14
 #define S_surfxml_platform_description_4 15
 #define S_surfxml_platform_description_5 16
-#define E_surfxml_platform_description 17
-#define ROOT_surfxml_include 18
-#define AL_surfxml_include 19
-#define E_surfxml_include 20
-#define ROOT_surfxml_cpu 21
-#define AL_surfxml_cpu 22
-#define E_surfxml_cpu 23
-#define ROOT_surfxml_router 24
-#define AL_surfxml_router 25
-#define E_surfxml_router 26
-#define ROOT_surfxml_network_link 27
-#define AL_surfxml_network_link 28
-#define E_surfxml_network_link 29
-#define ROOT_surfxml_route 30
-#define AL_surfxml_route 31
-#define S_surfxml_route 32
-#define S_surfxml_route_1 33
-#define S_surfxml_route_2 34
-#define E_surfxml_route 35
-#define ROOT_surfxml_route_element 36
-#define AL_surfxml_route_element 37
-#define E_surfxml_route_element 38
-#define ROOT_surfxml_process 39
-#define AL_surfxml_process 40
-#define S_surfxml_process 41
-#define S_surfxml_process_1 42
-#define S_surfxml_process_2 43
-#define E_surfxml_process 44
-#define ROOT_surfxml_argument 45
-#define AL_surfxml_argument 46
-#define E_surfxml_argument 47
-#define IMPOSSIBLE 48
+#define S_surfxml_platform_description_6 17
+#define S_surfxml_platform_description_7 18
+#define S_surfxml_platform_description_8 19
+#define S_surfxml_platform_description_9 20
+#define S_surfxml_platform_description_10 21
+#define S_surfxml_platform_description_11 22
+#define S_surfxml_platform_description_12 23
+#define S_surfxml_platform_description_13 24
+#define S_surfxml_platform_description_14 25
+#define S_surfxml_platform_description_15 26
+#define S_surfxml_platform_description_16 27
+#define E_surfxml_platform_description 28
+#define ROOT_surfxml_include 29
+#define AL_surfxml_include 30
+#define E_surfxml_include 31
+#define ROOT_surfxml_host 32
+#define AL_surfxml_host 33
+#define S_surfxml_host 34
+#define S_surfxml_host_1 35
+#define S_surfxml_host_2 36
+#define E_surfxml_host 37
+#define ROOT_surfxml_prop 38
+#define AL_surfxml_prop 39
+#define E_surfxml_prop 40
+#define ROOT_surfxml_router 41
+#define AL_surfxml_router 42
+#define E_surfxml_router 43
+#define ROOT_surfxml_link 44
+#define AL_surfxml_link 45
+#define S_surfxml_link 46
+#define S_surfxml_link_1 47
+#define S_surfxml_link_2 48
+#define E_surfxml_link 49
+#define ROOT_surfxml_route 50
+#define AL_surfxml_route 51
+#define S_surfxml_route 52
+#define S_surfxml_route_1 53
+#define S_surfxml_route_2 54
+#define E_surfxml_route 55
+#define ROOT_surfxml_link_c_ctn 56
+#define AL_surfxml_link_c_ctn 57
+#define E_surfxml_link_c_ctn 58
+#define ROOT_surfxml_process 59
+#define AL_surfxml_process 60
+#define S_surfxml_process 61
+#define S_surfxml_process_1 62
+#define S_surfxml_process_2 63
+#define E_surfxml_process 64
+#define ROOT_surfxml_argument 65
+#define AL_surfxml_argument 66
+#define E_surfxml_argument 67
+#define IMPOSSIBLE 68
 
 #ifndef YY_NO_UNISTD_H
 /* Special case for "unistd.h", since it is non-ANSI. We include it way
@@ -2479,28 +2525,48 @@ YY_DECL
   surfxml_statenames[S_surfxml_platform_description_3] = "platform_description";
   surfxml_statenames[S_surfxml_platform_description_4] = "platform_description";
   surfxml_statenames[S_surfxml_platform_description_5] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_6] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_7] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_8] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_9] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_10] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_11] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_12] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_13] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_14] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_15] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_16] = "platform_description";
   surfxml_statenames[E_surfxml_platform_description] = "platform_description";
   surfxml_statenames[ROOT_surfxml_include] = NULL;
   surfxml_statenames[AL_surfxml_include] = NULL;
   surfxml_statenames[E_surfxml_include] = "include";
-  surfxml_statenames[ROOT_surfxml_cpu] = NULL;
-  surfxml_statenames[AL_surfxml_cpu] = NULL;
-  surfxml_statenames[E_surfxml_cpu] = "cpu";
+  surfxml_statenames[ROOT_surfxml_host] = NULL;
+  surfxml_statenames[AL_surfxml_host] = NULL;
+  surfxml_statenames[S_surfxml_host] = "host";
+  surfxml_statenames[S_surfxml_host_1] = "host";
+  surfxml_statenames[S_surfxml_host_2] = "host";
+  surfxml_statenames[E_surfxml_host] = "host";
+  surfxml_statenames[ROOT_surfxml_prop] = NULL;
+  surfxml_statenames[AL_surfxml_prop] = NULL;
+  surfxml_statenames[E_surfxml_prop] = "prop";
   surfxml_statenames[ROOT_surfxml_router] = NULL;
   surfxml_statenames[AL_surfxml_router] = NULL;
   surfxml_statenames[E_surfxml_router] = "router";
-  surfxml_statenames[ROOT_surfxml_network_link] = NULL;
-  surfxml_statenames[AL_surfxml_network_link] = NULL;
-  surfxml_statenames[E_surfxml_network_link] = "network_link";
+  surfxml_statenames[ROOT_surfxml_link] = NULL;
+  surfxml_statenames[AL_surfxml_link] = NULL;
+  surfxml_statenames[S_surfxml_link] = "link";
+  surfxml_statenames[S_surfxml_link_1] = "link";
+  surfxml_statenames[S_surfxml_link_2] = "link";
+  surfxml_statenames[E_surfxml_link] = "link";
   surfxml_statenames[ROOT_surfxml_route] = NULL;
   surfxml_statenames[AL_surfxml_route] = NULL;
   surfxml_statenames[S_surfxml_route] = "route";
   surfxml_statenames[S_surfxml_route_1] = "route";
   surfxml_statenames[S_surfxml_route_2] = "route";
   surfxml_statenames[E_surfxml_route] = "route";
-  surfxml_statenames[ROOT_surfxml_route_element] = NULL;
-  surfxml_statenames[AL_surfxml_route_element] = NULL;
-  surfxml_statenames[E_surfxml_route_element] = "route_element";
+  surfxml_statenames[ROOT_surfxml_link_c_ctn] = NULL;
+  surfxml_statenames[AL_surfxml_link_c_ctn] = NULL;
+  surfxml_statenames[E_surfxml_link_c_ctn] = "link:ctn";
   surfxml_statenames[ROOT_surfxml_process] = NULL;
   surfxml_statenames[AL_surfxml_process] = NULL;
   surfxml_statenames[S_surfxml_process] = "process";
@@ -2565,13 +2631,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 >= 1531 )
+				if ( yy_current_state >= 1517 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 4149 );
+		while ( yy_base[yy_current_state] != 4285 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -2665,7 +2731,7 @@ FAIL("Bad declaration %s.",surf_parse_text);
 case 13:
 /* rule 13 can match eol */
 YY_RULE_SETUP
-SET(ROOT_surfxml_cpu);
+SET(ROOT_surfxml_link);
 	YY_BREAK
 case 14:
 /* rule 14 can match eol */
@@ -2680,12 +2746,12 @@ SET(ROOT_surfxml_route);
 case 16:
 /* rule 16 can match eol */
 YY_RULE_SETUP
-SET(ROOT_surfxml_network_link);
+SET(ROOT_surfxml_process);
 	YY_BREAK
 case 17:
 /* rule 17 can match eol */
 YY_RULE_SETUP
-SET(ROOT_surfxml_process);
+SET(ROOT_surfxml_link_c_ctn);
 	YY_BREAK
 case 18:
 /* rule 18 can match eol */
@@ -2695,24 +2761,29 @@ SET(ROOT_surfxml_router);
 case 19:
 /* rule 19 can match eol */
 YY_RULE_SETUP
-SET(ROOT_surfxml_argument);
+SET(ROOT_surfxml_host);
 	YY_BREAK
 case 20:
 /* rule 20 can match eol */
 YY_RULE_SETUP
-SET(ROOT_surfxml_route_element);
+SET(ROOT_surfxml_argument);
 	YY_BREAK
 case 21:
 /* rule 21 can match eol */
 YY_RULE_SETUP
-SET(ROOT_surfxml_platform_description);
+SET(ROOT_surfxml_prop);
 	YY_BREAK
 case 22:
 /* rule 22 can match eol */
 YY_RULE_SETUP
-FAIL("Bad declaration %s.",surf_parse_text);
+SET(ROOT_surfxml_platform_description);
 	YY_BREAK
 case 23:
+/* rule 23 can match eol */
+YY_RULE_SETUP
+FAIL("Bad declaration %s.",surf_parse_text);
+	YY_BREAK
+case 24:
 YY_RULE_SETUP
 FAIL("Unexpected character `%c' in prolog.", surf_parse_text[0]);
 	YY_BREAK
@@ -2723,11 +2794,6 @@ FAIL("EOF in prolog.");
 
 /* RULES DERIVED FROM DTD. */
 /* <!-- Small DTD for SURF based tools. -->  */
-case 24:
-/* rule 24 can match eol */
-YY_RULE_SETUP
-FAIL("Starting tag <platform_description> is not allowed here.");
-	YY_BREAK
 case 25:
 /* rule 25 can match eol */
 YY_RULE_SETUP
@@ -2795,62 +2861,63 @@ case 34:
 YY_RULE_SETUP
 FAIL("Unexpected character `%c': `</platform_description>' expected.",surf_parse_text[0]);
 	YY_BREAK
+case YY_STATE_EOF(S_surfxml_platform_description_8):
+case YY_STATE_EOF(S_surfxml_platform_description_16):
 case YY_STATE_EOF(E_surfxml_platform_description):
+case YY_STATE_EOF(S_surfxml_platform_description_2):
 case YY_STATE_EOF(S_surfxml_platform_description_5):
+case YY_STATE_EOF(S_surfxml_platform_description_9):
+case YY_STATE_EOF(S_surfxml_platform_description_11):
+case YY_STATE_EOF(S_surfxml_platform_description_12):
+case YY_STATE_EOF(S_surfxml_platform_description_14):
 case YY_STATE_EOF(S_surfxml_platform_description_3):
-case YY_STATE_EOF(S_surfxml_platform_description_1):
 case YY_STATE_EOF(S_surfxml_platform_description):
+case YY_STATE_EOF(S_surfxml_platform_description_6):
 FAIL("Premature EOF: `</platform_description>' expected.");
 	YY_BREAK
 
 case 35:
 /* rule 35 can match eol */
 YY_RULE_SETUP
-FAIL("Starting tag <include> is not allowed here.");
-	YY_BREAK
-case 36:
-/* rule 36 can match eol */
-YY_RULE_SETUP
 {
   AX_surfxml_include_file = 0;
   ENTER(AL_surfxml_include); pushbuffer(0);
   }
 	YY_BREAK
 
-case 37:
-/* rule 37 can match eol */
+case 36:
+/* rule 36 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE1); BUFFERSET(AX_surfxml_include_file);
 	YY_BREAK
-case 38:
-/* rule 38 can match eol */
+case 37:
+/* rule 37 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE2); BUFFERSET(AX_surfxml_include_file);
 	YY_BREAK
-case 39:
+case 38:
 YY_RULE_SETUP
 {
   if (!AX_surfxml_include_file) FAIL("Required attribute `file' not set for `include' element.");
   LEAVE; STag_surfxml_include();surfxml_pcdata_ix = 0; ENTER(E_surfxml_include);
  }
 	YY_BREAK
-case 40:
+case 39:
 YY_RULE_SETUP
 {
   if (!AX_surfxml_include_file) FAIL("Required attribute `file' not set for `include' element.");
   LEAVE; STag_surfxml_include(); surfxml_pcdata_ix = 0; ETag_surfxml_include(); popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_2: SET(S_surfxml_platform_description_3); break;
+   case S_surfxml_platform_description_2: case S_surfxml_platform_description_1: case S_surfxml_platform_description: SET(S_surfxml_platform_description_2); break;
    case ROOT_surfxml_include: SET(EPILOG); break;
-   case S_surfxml_platform_description_5: case S_surfxml_platform_description_3: case S_surfxml_platform_description_1: case S_surfxml_platform_description: case S_surfxml_platform_description_4: SET(S_surfxml_platform_description_5); break;
   }
  }
 	YY_BREAK
-case 41:
+case 40:
 YY_RULE_SETUP
 FAIL("Unexpected character `%c' in attribute list of include element.", surf_parse_text[0]);
 	YY_BREAK
-case 42:
+case 41:
 YY_RULE_SETUP
 FAIL("Bad attribute `%s' in `include' element start tag.",surf_parse_text);
 	YY_BREAK
@@ -2858,26 +2925,25 @@ case YY_STATE_EOF(AL_surfxml_include):
 FAIL("EOF in attribute list of `include' element.");
 	YY_BREAK
 
-case 43:
-/* rule 43 can match eol */
+case 42:
+/* rule 42 can match eol */
 YY_RULE_SETUP
 {
   LEAVE;
   ETag_surfxml_include();
   popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_2: SET(S_surfxml_platform_description_3); break;
+   case S_surfxml_platform_description_2: case S_surfxml_platform_description_1: case S_surfxml_platform_description: SET(S_surfxml_platform_description_2); break;
    case ROOT_surfxml_include: SET(EPILOG); break;
-   case S_surfxml_platform_description_5: case S_surfxml_platform_description_3: case S_surfxml_platform_description_1: case S_surfxml_platform_description: case S_surfxml_platform_description_4: SET(S_surfxml_platform_description_5); break;
   }
  }
 	YY_BREAK
-case 44:
-/* rule 44 can match eol */
+case 43:
+/* rule 43 can match eol */
 YY_RULE_SETUP
 FAIL("Unexpected end-tag `%s': `</include>' expected.",surf_parse_text);
 	YY_BREAK
-case 45:
+case 44:
 YY_RULE_SETUP
 FAIL("Unexpected character `%c': `</include>' expected.",surf_parse_text[0]);
 	YY_BREAK
@@ -2885,445 +2951,521 @@ case YY_STATE_EOF(E_surfxml_include):
 FAIL("Premature EOF: `</include>' expected.");
 	YY_BREAK
 
+case 45:
+/* rule 45 can match eol */
+YY_RULE_SETUP
+{
+  AX_surfxml_host_id = 0;
+  AX_surfxml_host_power = 0;
+  AX_surfxml_host_availability = 5;
+  AX_surfxml_host_availability_file = 0;
+  AX_surfxml_host_state = A_surfxml_host_state_ON;
+  AX_surfxml_host_state_file = 0;
+  AX_surfxml_host_interference_send = 9;
+  AX_surfxml_host_interference_recv = 13;
+  AX_surfxml_host_interference_send_recv = 17;
+  AX_surfxml_host_max_outgoing_rate = 21;
+  ENTER(AL_surfxml_host); pushbuffer(0);
+  }
+	YY_BREAK
+
 case 46:
 /* rule 46 can match eol */
 YY_RULE_SETUP
-FAIL("Starting tag <cpu> is not allowed here.");
+ENTER(VALUE1); BUFFERSET(AX_surfxml_host_id);
 	YY_BREAK
 case 47:
 /* rule 47 can match eol */
 YY_RULE_SETUP
-{
-  AX_surfxml_cpu_name = 0;
-  AX_surfxml_cpu_power = 0;
-  AX_surfxml_cpu_availability = 5;
-  AX_surfxml_cpu_availability_file = 0;
-  AX_surfxml_cpu_state = A_surfxml_cpu_state_ON;
-  AX_surfxml_cpu_state_file = 0;
-  AX_surfxml_cpu_interference_send = 9;
-  AX_surfxml_cpu_interference_recv = 13;
-  AX_surfxml_cpu_interference_send_recv = 17;
-  AX_surfxml_cpu_max_outgoing_rate = 21;
-  ENTER(AL_surfxml_cpu); pushbuffer(0);
-  }
+ENTER(VALUE2); BUFFERSET(AX_surfxml_host_id);
 	YY_BREAK
-
 case 48:
 /* rule 48 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE1); BUFFERSET(AX_surfxml_cpu_name);
+ENTER(VALUE1); BUFFERSET(AX_surfxml_host_power);
 	YY_BREAK
 case 49:
 /* rule 49 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE2); BUFFERSET(AX_surfxml_cpu_name);
+ENTER(VALUE2); BUFFERSET(AX_surfxml_host_power);
 	YY_BREAK
 case 50:
 /* rule 50 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE1); BUFFERSET(AX_surfxml_cpu_power);
+ENTER(VALUE1); BUFFERSET(AX_surfxml_host_availability);
 	YY_BREAK
 case 51:
 /* rule 51 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE2); BUFFERSET(AX_surfxml_cpu_power);
+ENTER(VALUE2); BUFFERSET(AX_surfxml_host_availability);
 	YY_BREAK
 case 52:
 /* rule 52 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE1); BUFFERSET(AX_surfxml_cpu_availability);
+ENTER(VALUE1); BUFFERSET(AX_surfxml_host_availability_file);
 	YY_BREAK
 case 53:
 /* rule 53 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE2); BUFFERSET(AX_surfxml_cpu_availability);
+ENTER(VALUE2); BUFFERSET(AX_surfxml_host_availability_file);
 	YY_BREAK
 case 54:
 /* rule 54 can match eol */
-YY_RULE_SETUP
-ENTER(VALUE1); BUFFERSET(AX_surfxml_cpu_availability_file);
-	YY_BREAK
 case 55:
 /* rule 55 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE2); BUFFERSET(AX_surfxml_cpu_availability_file);
+A_surfxml_host_state = A_surfxml_host_state_ON;
 	YY_BREAK
 case 56:
 /* rule 56 can match eol */
 case 57:
 /* rule 57 can match eol */
 YY_RULE_SETUP
-A_surfxml_cpu_state = A_surfxml_cpu_state_ON;
+A_surfxml_host_state = A_surfxml_host_state_OFF;
 	YY_BREAK
 case 58:
 /* rule 58 can match eol */
+YY_RULE_SETUP
+ENTER(VALUE1); BUFFERSET(AX_surfxml_host_state_file);
+	YY_BREAK
 case 59:
 /* rule 59 can match eol */
 YY_RULE_SETUP
-A_surfxml_cpu_state = A_surfxml_cpu_state_OFF;
+ENTER(VALUE2); BUFFERSET(AX_surfxml_host_state_file);
 	YY_BREAK
 case 60:
 /* rule 60 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE1); BUFFERSET(AX_surfxml_cpu_state_file);
+ENTER(VALUE1); BUFFERSET(AX_surfxml_host_interference_send);
 	YY_BREAK
 case 61:
 /* rule 61 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE2); BUFFERSET(AX_surfxml_cpu_state_file);
+ENTER(VALUE2); BUFFERSET(AX_surfxml_host_interference_send);
 	YY_BREAK
 case 62:
 /* rule 62 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE1); BUFFERSET(AX_surfxml_cpu_interference_send);
+ENTER(VALUE1); BUFFERSET(AX_surfxml_host_interference_recv);
 	YY_BREAK
 case 63:
 /* rule 63 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE2); BUFFERSET(AX_surfxml_cpu_interference_send);
+ENTER(VALUE2); BUFFERSET(AX_surfxml_host_interference_recv);
 	YY_BREAK
 case 64:
 /* rule 64 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE1); BUFFERSET(AX_surfxml_cpu_interference_recv);
+ENTER(VALUE1); BUFFERSET(AX_surfxml_host_interference_send_recv);
 	YY_BREAK
 case 65:
 /* rule 65 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE2); BUFFERSET(AX_surfxml_cpu_interference_recv);
+ENTER(VALUE2); BUFFERSET(AX_surfxml_host_interference_send_recv);
 	YY_BREAK
 case 66:
 /* rule 66 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE1); BUFFERSET(AX_surfxml_cpu_interference_send_recv);
+ENTER(VALUE1); BUFFERSET(AX_surfxml_host_max_outgoing_rate);
 	YY_BREAK
 case 67:
 /* rule 67 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE2); BUFFERSET(AX_surfxml_cpu_interference_send_recv);
+ENTER(VALUE2); BUFFERSET(AX_surfxml_host_max_outgoing_rate);
 	YY_BREAK
 case 68:
-/* rule 68 can match eol */
-YY_RULE_SETUP
-ENTER(VALUE1); BUFFERSET(AX_surfxml_cpu_max_outgoing_rate);
-	YY_BREAK
-case 69:
-/* rule 69 can match eol */
-YY_RULE_SETUP
-ENTER(VALUE2); BUFFERSET(AX_surfxml_cpu_max_outgoing_rate);
-	YY_BREAK
-case 70:
 YY_RULE_SETUP
 {
-  if (!AX_surfxml_cpu_name) FAIL("Required attribute `name' not set for `cpu' element.");
-  if (!AX_surfxml_cpu_power) FAIL("Required attribute `power' not set for `cpu' element.");
-  LEAVE; STag_surfxml_cpu();surfxml_pcdata_ix = 0; ENTER(E_surfxml_cpu);
+  if (!AX_surfxml_host_id) FAIL("Required attribute `id' not set for `host' element.");
+  if (!AX_surfxml_host_power) FAIL("Required attribute `power' not set for `host' element.");
+  LEAVE; STag_surfxml_host();surfxml_pcdata_ix = 0; ENTER(S_surfxml_host);
  }
 	YY_BREAK
-case 71:
+case 69:
 YY_RULE_SETUP
 {
-  if (!AX_surfxml_cpu_name) FAIL("Required attribute `name' not set for `cpu' element.");
-  if (!AX_surfxml_cpu_power) FAIL("Required attribute `power' not set for `cpu' element.");
-  LEAVE; STag_surfxml_cpu(); surfxml_pcdata_ix = 0; ETag_surfxml_cpu(); popbuffer(); /* attribute */
+  if (!AX_surfxml_host_id) FAIL("Required attribute `id' not set for `host' element.");
+  if (!AX_surfxml_host_power) FAIL("Required attribute `power' not set for `host' element.");
+  LEAVE; STag_surfxml_host(); surfxml_pcdata_ix = 0; ETag_surfxml_host(); popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_2: case S_surfxml_platform_description_3: case S_surfxml_platform_description: SET(S_surfxml_platform_description_3); break;
-   case ROOT_surfxml_cpu: SET(EPILOG); break;
+   case S_surfxml_platform_description_5: case S_surfxml_platform_description: case S_surfxml_platform_description_4: SET(S_surfxml_platform_description_5); break;
+   case ROOT_surfxml_host: SET(EPILOG); break;
   }
  }
 	YY_BREAK
-case 72:
+case 70:
 YY_RULE_SETUP
-FAIL("Unexpected character `%c' in attribute list of cpu element.", surf_parse_text[0]);
+FAIL("Unexpected character `%c' in attribute list of host element.", surf_parse_text[0]);
 	YY_BREAK
-case 73:
+case 71:
 YY_RULE_SETUP
-FAIL("Bad attribute `%s' in `cpu' element start tag.",surf_parse_text);
+FAIL("Bad attribute `%s' in `host' element start tag.",surf_parse_text);
 	YY_BREAK
-case YY_STATE_EOF(AL_surfxml_cpu):
-FAIL("EOF in attribute list of `cpu' element.");
+case YY_STATE_EOF(AL_surfxml_host):
+FAIL("EOF in attribute list of `host' element.");
 	YY_BREAK
 
-case 74:
-/* rule 74 can match eol */
+case 72:
+/* rule 72 can match eol */
 YY_RULE_SETUP
 {
   LEAVE;
-  ETag_surfxml_cpu();
+  ETag_surfxml_host();
   popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_2: case S_surfxml_platform_description_3: case S_surfxml_platform_description: SET(S_surfxml_platform_description_3); break;
-   case ROOT_surfxml_cpu: SET(EPILOG); break;
+   case S_surfxml_platform_description_5: case S_surfxml_platform_description: case S_surfxml_platform_description_4: SET(S_surfxml_platform_description_5); break;
+   case ROOT_surfxml_host: SET(EPILOG); break;
   }
  }
 	YY_BREAK
+case 73:
+/* rule 73 can match eol */
+YY_RULE_SETUP
+FAIL("Unexpected end-tag `%s': `</host>' expected.",surf_parse_text);
+	YY_BREAK
+case 74:
+YY_RULE_SETUP
+FAIL("Unexpected character `%c': `</host>' expected.",surf_parse_text[0]);
+	YY_BREAK
+case YY_STATE_EOF(S_surfxml_host):
+case YY_STATE_EOF(E_surfxml_host):
+case YY_STATE_EOF(S_surfxml_host_2):
+FAIL("Premature EOF: `</host>' expected.");
+	YY_BREAK
+
 case 75:
 /* rule 75 can match eol */
 YY_RULE_SETUP
-FAIL("Unexpected end-tag `%s': `</cpu>' expected.",surf_parse_text);
+{
+  AX_surfxml_prop_id = 0;
+  AX_surfxml_prop_value = 0;
+  ENTER(AL_surfxml_prop); pushbuffer(0);
+  }
 	YY_BREAK
+
 case 76:
+/* rule 76 can match eol */
 YY_RULE_SETUP
-FAIL("Unexpected character `%c': `</cpu>' expected.",surf_parse_text[0]);
-	YY_BREAK
-case YY_STATE_EOF(E_surfxml_cpu):
-FAIL("Premature EOF: `</cpu>' expected.");
+ENTER(VALUE1); BUFFERSET(AX_surfxml_prop_id);
 	YY_BREAK
-
 case 77:
 /* rule 77 can match eol */
 YY_RULE_SETUP
-FAIL("Starting tag <router> is not allowed here.");
+ENTER(VALUE2); BUFFERSET(AX_surfxml_prop_id);
 	YY_BREAK
 case 78:
 /* rule 78 can match eol */
 YY_RULE_SETUP
-{
-  AX_surfxml_router_name = 0;
-  ENTER(AL_surfxml_router); pushbuffer(0);
-  }
+ENTER(VALUE1); BUFFERSET(AX_surfxml_prop_value);
 	YY_BREAK
-
 case 79:
 /* rule 79 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE1); BUFFERSET(AX_surfxml_router_name);
+ENTER(VALUE2); BUFFERSET(AX_surfxml_prop_value);
 	YY_BREAK
 case 80:
-/* rule 80 can match eol */
-YY_RULE_SETUP
-ENTER(VALUE2); BUFFERSET(AX_surfxml_router_name);
-	YY_BREAK
-case 81:
 YY_RULE_SETUP
 {
-  if (!AX_surfxml_router_name) FAIL("Required attribute `name' not set for `router' element.");
-  LEAVE; STag_surfxml_router();surfxml_pcdata_ix = 0; ENTER(E_surfxml_router);
+  if (!AX_surfxml_prop_id) FAIL("Required attribute `id' not set for `prop' element.");
+  if (!AX_surfxml_prop_value) FAIL("Required attribute `value' not set for `prop' element.");
+  LEAVE; STag_surfxml_prop();surfxml_pcdata_ix = 0; ENTER(E_surfxml_prop);
  }
 	YY_BREAK
-case 82:
+case 81:
 YY_RULE_SETUP
 {
-  if (!AX_surfxml_router_name) FAIL("Required attribute `name' not set for `router' element.");
-  LEAVE; STag_surfxml_router(); surfxml_pcdata_ix = 0; ETag_surfxml_router(); popbuffer(); /* attribute */
+  if (!AX_surfxml_prop_id) FAIL("Required attribute `id' not set for `prop' element.");
+  if (!AX_surfxml_prop_value) FAIL("Required attribute `value' not set for `prop' element.");
+  LEAVE; STag_surfxml_prop(); surfxml_pcdata_ix = 0; ETag_surfxml_prop(); popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_2: case S_surfxml_platform_description_3: case S_surfxml_platform_description: SET(S_surfxml_platform_description_3); break;
-   case ROOT_surfxml_router: SET(EPILOG); break;
+   case S_surfxml_process_1: case S_surfxml_process: case S_surfxml_process_2: SET(S_surfxml_process_2); break;
+   case S_surfxml_host: case S_surfxml_host_1: case S_surfxml_host_2: SET(S_surfxml_host_2); break;
+   case ROOT_surfxml_prop: SET(EPILOG); break;
+   case S_surfxml_link_1: case S_surfxml_link_2: case S_surfxml_link: SET(S_surfxml_link_2); break;
   }
  }
 	YY_BREAK
-case 83:
+case 82:
 YY_RULE_SETUP
-FAIL("Unexpected character `%c' in attribute list of router element.", surf_parse_text[0]);
+FAIL("Unexpected character `%c' in attribute list of prop element.", surf_parse_text[0]);
 	YY_BREAK
-case 84:
+case 83:
 YY_RULE_SETUP
-FAIL("Bad attribute `%s' in `router' element start tag.",surf_parse_text);
+FAIL("Bad attribute `%s' in `prop' element start tag.",surf_parse_text);
 	YY_BREAK
-case YY_STATE_EOF(AL_surfxml_router):
-FAIL("EOF in attribute list of `router' element.");
+case YY_STATE_EOF(AL_surfxml_prop):
+FAIL("EOF in attribute list of `prop' element.");
 	YY_BREAK
 
-case 85:
-/* rule 85 can match eol */
+case 84:
+/* rule 84 can match eol */
 YY_RULE_SETUP
 {
   LEAVE;
-  ETag_surfxml_router();
+  ETag_surfxml_prop();
   popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_2: case S_surfxml_platform_description_3: case S_surfxml_platform_description: SET(S_surfxml_platform_description_3); break;
-   case ROOT_surfxml_router: SET(EPILOG); break;
+   case S_surfxml_process_1: case S_surfxml_process: case S_surfxml_process_2: SET(S_surfxml_process_2); break;
+   case S_surfxml_host: case S_surfxml_host_1: case S_surfxml_host_2: SET(S_surfxml_host_2); break;
+   case ROOT_surfxml_prop: SET(EPILOG); break;
+   case S_surfxml_link_1: case S_surfxml_link_2: case S_surfxml_link: SET(S_surfxml_link_2); break;
   }
  }
 	YY_BREAK
+case 85:
+/* rule 85 can match eol */
+YY_RULE_SETUP
+FAIL("Unexpected end-tag `%s': `</prop>' expected.",surf_parse_text);
+	YY_BREAK
 case 86:
-/* rule 86 can match eol */
 YY_RULE_SETUP
-FAIL("Unexpected end-tag `%s': `</router>' expected.",surf_parse_text);
+FAIL("Unexpected character `%c': `</prop>' expected.",surf_parse_text[0]);
+	YY_BREAK
+case YY_STATE_EOF(E_surfxml_prop):
+FAIL("Premature EOF: `</prop>' expected.");
 	YY_BREAK
+
 case 87:
+/* rule 87 can match eol */
 YY_RULE_SETUP
-FAIL("Unexpected character `%c': `</router>' expected.",surf_parse_text[0]);
-	YY_BREAK
-case YY_STATE_EOF(E_surfxml_router):
-FAIL("Premature EOF: `</router>' expected.");
+{
+  AX_surfxml_router_id = 0;
+  ENTER(AL_surfxml_router); pushbuffer(0);
+  }
 	YY_BREAK
 
 case 88:
 /* rule 88 can match eol */
 YY_RULE_SETUP
-FAIL("Starting tag <network_link> is not allowed here.");
+ENTER(VALUE1); BUFFERSET(AX_surfxml_router_id);
 	YY_BREAK
 case 89:
 /* rule 89 can match eol */
 YY_RULE_SETUP
-{
-  AX_surfxml_network_link_name = 0;
-  AX_surfxml_network_link_bandwidth = 0;
-  AX_surfxml_network_link_bandwidth_file = 0;
-  AX_surfxml_network_link_latency = 26;
-  AX_surfxml_network_link_latency_file = 0;
-  AX_surfxml_network_link_state = A_surfxml_network_link_state_ON;
-  AX_surfxml_network_link_state_file = 0;
-  AX_surfxml_network_link_sharing_policy = A_surfxml_network_link_sharing_policy_SHARED;
-  ENTER(AL_surfxml_network_link); pushbuffer(0);
-  }
+ENTER(VALUE2); BUFFERSET(AX_surfxml_router_id);
 	YY_BREAK
-
 case 90:
-/* rule 90 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE1); BUFFERSET(AX_surfxml_network_link_name);
+{
+  if (!AX_surfxml_router_id) FAIL("Required attribute `id' not set for `router' element.");
+  LEAVE; STag_surfxml_router();surfxml_pcdata_ix = 0; ENTER(E_surfxml_router);
+ }
 	YY_BREAK
 case 91:
-/* rule 91 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE2); BUFFERSET(AX_surfxml_network_link_name);
+{
+  if (!AX_surfxml_router_id) FAIL("Required attribute `id' not set for `router' element.");
+  LEAVE; STag_surfxml_router(); surfxml_pcdata_ix = 0; ETag_surfxml_router(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_platform_description_8: case S_surfxml_platform_description_5: case S_surfxml_platform_description_3: case S_surfxml_platform_description: case S_surfxml_platform_description_7: SET(S_surfxml_platform_description_8); break;
+   case ROOT_surfxml_router: SET(EPILOG); break;
+  }
+ }
 	YY_BREAK
 case 92:
-/* rule 92 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE1); BUFFERSET(AX_surfxml_network_link_bandwidth);
+FAIL("Unexpected character `%c' in attribute list of router element.", surf_parse_text[0]);
 	YY_BREAK
 case 93:
-/* rule 93 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE2); BUFFERSET(AX_surfxml_network_link_bandwidth);
+FAIL("Bad attribute `%s' in `router' element start tag.",surf_parse_text);
+	YY_BREAK
+case YY_STATE_EOF(AL_surfxml_router):
+FAIL("EOF in attribute list of `router' element.");
 	YY_BREAK
+
 case 94:
 /* rule 94 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE1); BUFFERSET(AX_surfxml_network_link_bandwidth_file);
+{
+  LEAVE;
+  ETag_surfxml_router();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_platform_description_8: case S_surfxml_platform_description_5: case S_surfxml_platform_description_3: case S_surfxml_platform_description: case S_surfxml_platform_description_7: SET(S_surfxml_platform_description_8); break;
+   case ROOT_surfxml_router: SET(EPILOG); break;
+  }
+ }
 	YY_BREAK
 case 95:
 /* rule 95 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE2); BUFFERSET(AX_surfxml_network_link_bandwidth_file);
+FAIL("Unexpected end-tag `%s': `</router>' expected.",surf_parse_text);
 	YY_BREAK
 case 96:
-/* rule 96 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE1); BUFFERSET(AX_surfxml_network_link_latency);
+FAIL("Unexpected character `%c': `</router>' expected.",surf_parse_text[0]);
+	YY_BREAK
+case YY_STATE_EOF(E_surfxml_router):
+FAIL("Premature EOF: `</router>' expected.");
 	YY_BREAK
+
 case 97:
 /* rule 97 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE2); BUFFERSET(AX_surfxml_network_link_latency);
+{
+  AX_surfxml_link_id = 0;
+  AX_surfxml_link_bandwidth = 0;
+  AX_surfxml_link_bandwidth_file = 0;
+  AX_surfxml_link_latency = 26;
+  AX_surfxml_link_latency_file = 0;
+  AX_surfxml_link_state = A_surfxml_link_state_ON;
+  AX_surfxml_link_state_file = 0;
+  AX_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+  ENTER(AL_surfxml_link); pushbuffer(0);
+  }
 	YY_BREAK
+
 case 98:
 /* rule 98 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE1); BUFFERSET(AX_surfxml_network_link_latency_file);
+ENTER(VALUE1); BUFFERSET(AX_surfxml_link_id);
 	YY_BREAK
 case 99:
 /* rule 99 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE2); BUFFERSET(AX_surfxml_network_link_latency_file);
+ENTER(VALUE2); BUFFERSET(AX_surfxml_link_id);
 	YY_BREAK
 case 100:
 /* rule 100 can match eol */
+YY_RULE_SETUP
+ENTER(VALUE1); BUFFERSET(AX_surfxml_link_bandwidth);
+	YY_BREAK
 case 101:
 /* rule 101 can match eol */
 YY_RULE_SETUP
-A_surfxml_network_link_state = A_surfxml_network_link_state_ON;
+ENTER(VALUE2); BUFFERSET(AX_surfxml_link_bandwidth);
 	YY_BREAK
 case 102:
 /* rule 102 can match eol */
+YY_RULE_SETUP
+ENTER(VALUE1); BUFFERSET(AX_surfxml_link_bandwidth_file);
+	YY_BREAK
 case 103:
 /* rule 103 can match eol */
 YY_RULE_SETUP
-A_surfxml_network_link_state = A_surfxml_network_link_state_OFF;
+ENTER(VALUE2); BUFFERSET(AX_surfxml_link_bandwidth_file);
 	YY_BREAK
 case 104:
 /* rule 104 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE1); BUFFERSET(AX_surfxml_network_link_state_file);
+ENTER(VALUE1); BUFFERSET(AX_surfxml_link_latency);
 	YY_BREAK
 case 105:
 /* rule 105 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE2); BUFFERSET(AX_surfxml_network_link_state_file);
+ENTER(VALUE2); BUFFERSET(AX_surfxml_link_latency);
 	YY_BREAK
 case 106:
 /* rule 106 can match eol */
+YY_RULE_SETUP
+ENTER(VALUE1); BUFFERSET(AX_surfxml_link_latency_file);
+	YY_BREAK
 case 107:
 /* rule 107 can match eol */
 YY_RULE_SETUP
-A_surfxml_network_link_sharing_policy = A_surfxml_network_link_sharing_policy_SHARED;
+ENTER(VALUE2); BUFFERSET(AX_surfxml_link_latency_file);
 	YY_BREAK
 case 108:
 /* rule 108 can match eol */
 case 109:
 /* rule 109 can match eol */
 YY_RULE_SETUP
-A_surfxml_network_link_sharing_policy = A_surfxml_network_link_sharing_policy_FATPIPE;
+A_surfxml_link_state = A_surfxml_link_state_ON;
 	YY_BREAK
 case 110:
+/* rule 110 can match eol */
+case 111:
+/* rule 111 can match eol */
+YY_RULE_SETUP
+A_surfxml_link_state = A_surfxml_link_state_OFF;
+	YY_BREAK
+case 112:
+/* rule 112 can match eol */
+YY_RULE_SETUP
+ENTER(VALUE1); BUFFERSET(AX_surfxml_link_state_file);
+	YY_BREAK
+case 113:
+/* rule 113 can match eol */
+YY_RULE_SETUP
+ENTER(VALUE2); BUFFERSET(AX_surfxml_link_state_file);
+	YY_BREAK
+case 114:
+/* rule 114 can match eol */
+case 115:
+/* rule 115 can match eol */
+YY_RULE_SETUP
+A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+	YY_BREAK
+case 116:
+/* rule 116 can match eol */
+case 117:
+/* rule 117 can match eol */
+YY_RULE_SETUP
+A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;
+	YY_BREAK
+case 118:
 YY_RULE_SETUP
 {
-  if (!AX_surfxml_network_link_name) FAIL("Required attribute `name' not set for `network_link' element.");
-  if (!AX_surfxml_network_link_bandwidth) FAIL("Required attribute `bandwidth' not set for `network_link' element.");
-  LEAVE; STag_surfxml_network_link();surfxml_pcdata_ix = 0; ENTER(E_surfxml_network_link);
+  if (!AX_surfxml_link_id) FAIL("Required attribute `id' not set for `link' element.");
+  if (!AX_surfxml_link_bandwidth) FAIL("Required attribute `bandwidth' not set for `link' element.");
+  LEAVE; STag_surfxml_link();surfxml_pcdata_ix = 0; ENTER(S_surfxml_link);
  }
 	YY_BREAK
-case 111:
+case 119:
 YY_RULE_SETUP
 {
-  if (!AX_surfxml_network_link_name) FAIL("Required attribute `name' not set for `network_link' element.");
-  if (!AX_surfxml_network_link_bandwidth) FAIL("Required attribute `bandwidth' not set for `network_link' element.");
-  LEAVE; STag_surfxml_network_link(); surfxml_pcdata_ix = 0; ETag_surfxml_network_link(); popbuffer(); /* attribute */
+  if (!AX_surfxml_link_id) FAIL("Required attribute `id' not set for `link' element.");
+  if (!AX_surfxml_link_bandwidth) FAIL("Required attribute `bandwidth' not set for `link' element.");
+  LEAVE; STag_surfxml_link(); surfxml_pcdata_ix = 0; ETag_surfxml_link(); popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_2: case S_surfxml_platform_description_3: case S_surfxml_platform_description: SET(S_surfxml_platform_description_3); break;
-   case ROOT_surfxml_network_link: SET(EPILOG); break;
+   case S_surfxml_platform_description_8: case S_surfxml_platform_description_10: case S_surfxml_platform_description_5: case S_surfxml_platform_description_11: case S_surfxml_platform_description_3: case S_surfxml_platform_description: case S_surfxml_platform_description_6: SET(S_surfxml_platform_description_11); break;
+   case ROOT_surfxml_link: SET(EPILOG); break;
   }
  }
 	YY_BREAK
-case 112:
+case 120:
 YY_RULE_SETUP
-FAIL("Unexpected character `%c' in attribute list of network_link element.", surf_parse_text[0]);
+FAIL("Unexpected character `%c' in attribute list of link element.", surf_parse_text[0]);
 	YY_BREAK
-case 113:
+case 121:
 YY_RULE_SETUP
-FAIL("Bad attribute `%s' in `network_link' element start tag.",surf_parse_text);
+FAIL("Bad attribute `%s' in `link' element start tag.",surf_parse_text);
 	YY_BREAK
-case YY_STATE_EOF(AL_surfxml_network_link):
-FAIL("EOF in attribute list of `network_link' element.");
+case YY_STATE_EOF(AL_surfxml_link):
+FAIL("EOF in attribute list of `link' element.");
 	YY_BREAK
 
-case 114:
-/* rule 114 can match eol */
+case 122:
+/* rule 122 can match eol */
 YY_RULE_SETUP
 {
   LEAVE;
-  ETag_surfxml_network_link();
+  ETag_surfxml_link();
   popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_2: case S_surfxml_platform_description_3: case S_surfxml_platform_description: SET(S_surfxml_platform_description_3); break;
-   case ROOT_surfxml_network_link: SET(EPILOG); break;
+   case S_surfxml_platform_description_8: case S_surfxml_platform_description_10: case S_surfxml_platform_description_5: case S_surfxml_platform_description_11: case S_surfxml_platform_description_3: case S_surfxml_platform_description: case S_surfxml_platform_description_6: SET(S_surfxml_platform_description_11); break;
+   case ROOT_surfxml_link: SET(EPILOG); break;
   }
  }
 	YY_BREAK
-case 115:
-/* rule 115 can match eol */
+case 123:
+/* rule 123 can match eol */
 YY_RULE_SETUP
-FAIL("Unexpected end-tag `%s': `</network_link>' expected.",surf_parse_text);
+FAIL("Unexpected end-tag `%s': `</link>' expected.",surf_parse_text);
 	YY_BREAK
-case 116:
+case 124:
 YY_RULE_SETUP
-FAIL("Unexpected character `%c': `</network_link>' expected.",surf_parse_text[0]);
+FAIL("Unexpected character `%c': `</link>' expected.",surf_parse_text[0]);
 	YY_BREAK
-case YY_STATE_EOF(E_surfxml_network_link):
-FAIL("Premature EOF: `</network_link>' expected.");
+case YY_STATE_EOF(E_surfxml_link):
+case YY_STATE_EOF(S_surfxml_link_2):
+case YY_STATE_EOF(S_surfxml_link):
+FAIL("Premature EOF: `</link>' expected.");
 	YY_BREAK
 
-case 117:
-/* rule 117 can match eol */
-YY_RULE_SETUP
-FAIL("Starting tag <route> is not allowed here.");
-	YY_BREAK
-case 118:
-/* rule 118 can match eol */
+case 125:
+/* rule 125 can match eol */
 YY_RULE_SETUP
 {
   AX_surfxml_route_src = 0;
@@ -3336,67 +3478,67 @@ YY_RULE_SETUP
   }
 	YY_BREAK
 
-case 119:
-/* rule 119 can match eol */
+case 126:
+/* rule 126 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE1); BUFFERSET(AX_surfxml_route_src);
 	YY_BREAK
-case 120:
-/* rule 120 can match eol */
+case 127:
+/* rule 127 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE2); BUFFERSET(AX_surfxml_route_src);
 	YY_BREAK
-case 121:
-/* rule 121 can match eol */
+case 128:
+/* rule 128 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE1); BUFFERSET(AX_surfxml_route_dst);
 	YY_BREAK
-case 122:
-/* rule 122 can match eol */
+case 129:
+/* rule 129 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE2); BUFFERSET(AX_surfxml_route_dst);
 	YY_BREAK
-case 123:
-/* rule 123 can match eol */
+case 130:
+/* rule 130 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE1); BUFFERSET(AX_surfxml_route_impact_on_src);
 	YY_BREAK
-case 124:
-/* rule 124 can match eol */
+case 131:
+/* rule 131 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE2); BUFFERSET(AX_surfxml_route_impact_on_src);
 	YY_BREAK
-case 125:
-/* rule 125 can match eol */
+case 132:
+/* rule 132 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE1); BUFFERSET(AX_surfxml_route_impact_on_dst);
 	YY_BREAK
-case 126:
-/* rule 126 can match eol */
+case 133:
+/* rule 133 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE2); BUFFERSET(AX_surfxml_route_impact_on_dst);
 	YY_BREAK
-case 127:
-/* rule 127 can match eol */
+case 134:
+/* rule 134 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE1); BUFFERSET(AX_surfxml_route_impact_on_src_with_other_recv);
 	YY_BREAK
-case 128:
-/* rule 128 can match eol */
+case 135:
+/* rule 135 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE2); BUFFERSET(AX_surfxml_route_impact_on_src_with_other_recv);
 	YY_BREAK
-case 129:
-/* rule 129 can match eol */
+case 136:
+/* rule 136 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE1); BUFFERSET(AX_surfxml_route_impact_on_dst_with_other_send);
 	YY_BREAK
-case 130:
-/* rule 130 can match eol */
+case 137:
+/* rule 137 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE2); BUFFERSET(AX_surfxml_route_impact_on_dst_with_other_send);
 	YY_BREAK
-case 131:
+case 138:
 YY_RULE_SETUP
 {
   if (!AX_surfxml_route_src) FAIL("Required attribute `src' not set for `route' element.");
@@ -3404,23 +3546,23 @@ YY_RULE_SETUP
   LEAVE; STag_surfxml_route();surfxml_pcdata_ix = 0; ENTER(S_surfxml_route);
  }
 	YY_BREAK
-case 132:
+case 139:
 YY_RULE_SETUP
 {
   if (!AX_surfxml_route_src) FAIL("Required attribute `src' not set for `route' element.");
   if (!AX_surfxml_route_dst) FAIL("Required attribute `dst' not set for `route' element.");
   LEAVE; STag_surfxml_route(); surfxml_pcdata_ix = 0; ETag_surfxml_route(); popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_5: case S_surfxml_platform_description_3: case S_surfxml_platform_description_1: case S_surfxml_platform_description: case S_surfxml_platform_description_4: SET(S_surfxml_platform_description_5); break;
+   case S_surfxml_platform_description_8: case S_surfxml_platform_description_5: case S_surfxml_platform_description_9: case S_surfxml_platform_description_11: case S_surfxml_platform_description_13: case S_surfxml_platform_description_14: case S_surfxml_platform_description_3: case S_surfxml_platform_description: case S_surfxml_platform_description_6: SET(S_surfxml_platform_description_14); break;
    case ROOT_surfxml_route: SET(EPILOG); break;
   }
  }
 	YY_BREAK
-case 133:
+case 140:
 YY_RULE_SETUP
 FAIL("Unexpected character `%c' in attribute list of route element.", surf_parse_text[0]);
 	YY_BREAK
-case 134:
+case 141:
 YY_RULE_SETUP
 FAIL("Bad attribute `%s' in `route' element start tag.",surf_parse_text);
 	YY_BREAK
@@ -3428,25 +3570,25 @@ case YY_STATE_EOF(AL_surfxml_route):
 FAIL("EOF in attribute list of `route' element.");
 	YY_BREAK
 
-case 135:
-/* rule 135 can match eol */
+case 142:
+/* rule 142 can match eol */
 YY_RULE_SETUP
 {
   LEAVE;
   ETag_surfxml_route();
   popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_5: case S_surfxml_platform_description_3: case S_surfxml_platform_description_1: case S_surfxml_platform_description: case S_surfxml_platform_description_4: SET(S_surfxml_platform_description_5); break;
+   case S_surfxml_platform_description_8: case S_surfxml_platform_description_5: case S_surfxml_platform_description_9: case S_surfxml_platform_description_11: case S_surfxml_platform_description_13: case S_surfxml_platform_description_14: case S_surfxml_platform_description_3: case S_surfxml_platform_description: case S_surfxml_platform_description_6: SET(S_surfxml_platform_description_14); break;
    case ROOT_surfxml_route: SET(EPILOG); break;
   }
  }
 	YY_BREAK
-case 136:
-/* rule 136 can match eol */
+case 143:
+/* rule 143 can match eol */
 YY_RULE_SETUP
 FAIL("Unexpected end-tag `%s': `</route>' expected.",surf_parse_text);
 	YY_BREAK
-case 137:
+case 144:
 YY_RULE_SETUP
 FAIL("Unexpected character `%c': `</route>' expected.",surf_parse_text[0]);
 	YY_BREAK
@@ -3456,93 +3598,83 @@ case YY_STATE_EOF(E_surfxml_route):
 FAIL("Premature EOF: `</route>' expected.");
 	YY_BREAK
 
-case 138:
-/* rule 138 can match eol */
-YY_RULE_SETUP
-FAIL("Starting tag <route_element> is not allowed here.");
-	YY_BREAK
-case 139:
-/* rule 139 can match eol */
+case 145:
+/* rule 145 can match eol */
 YY_RULE_SETUP
 {
-  AX_surfxml_route_element_name = 0;
-  ENTER(AL_surfxml_route_element); pushbuffer(0);
+  AX_surfxml_link_c_ctn_id = 0;
+  ENTER(AL_surfxml_link_c_ctn); pushbuffer(0);
   }
 	YY_BREAK
 
-case 140:
-/* rule 140 can match eol */
+case 146:
+/* rule 146 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE1); BUFFERSET(AX_surfxml_route_element_name);
+ENTER(VALUE1); BUFFERSET(AX_surfxml_link_c_ctn_id);
 	YY_BREAK
-case 141:
-/* rule 141 can match eol */
+case 147:
+/* rule 147 can match eol */
 YY_RULE_SETUP
-ENTER(VALUE2); BUFFERSET(AX_surfxml_route_element_name);
+ENTER(VALUE2); BUFFERSET(AX_surfxml_link_c_ctn_id);
 	YY_BREAK
-case 142:
+case 148:
 YY_RULE_SETUP
 {
-  if (!AX_surfxml_route_element_name) FAIL("Required attribute `name' not set for `route_element' element.");
-  LEAVE; STag_surfxml_route_element();surfxml_pcdata_ix = 0; ENTER(E_surfxml_route_element);
+  if (!AX_surfxml_link_c_ctn_id) FAIL("Required attribute `id' not set for `link:ctn' element.");
+  LEAVE; STag_surfxml_link_c_ctn();surfxml_pcdata_ix = 0; ENTER(E_surfxml_link_c_ctn);
  }
 	YY_BREAK
-case 143:
+case 149:
 YY_RULE_SETUP
 {
-  if (!AX_surfxml_route_element_name) FAIL("Required attribute `name' not set for `route_element' element.");
-  LEAVE; STag_surfxml_route_element(); surfxml_pcdata_ix = 0; ETag_surfxml_route_element(); popbuffer(); /* attribute */
+  if (!AX_surfxml_link_c_ctn_id) FAIL("Required attribute `id' not set for `link:ctn' element.");
+  LEAVE; STag_surfxml_link_c_ctn(); surfxml_pcdata_ix = 0; ETag_surfxml_link_c_ctn(); popbuffer(); /* attribute */
   switch (YY_START) {
    case S_surfxml_route_1: case S_surfxml_route: case S_surfxml_route_2: SET(S_surfxml_route_2); break;
-   case ROOT_surfxml_route_element: SET(EPILOG); break;
+   case ROOT_surfxml_link_c_ctn: SET(EPILOG); break;
   }
  }
 	YY_BREAK
-case 144:
+case 150:
 YY_RULE_SETUP
-FAIL("Unexpected character `%c' in attribute list of route_element element.", surf_parse_text[0]);
+FAIL("Unexpected character `%c' in attribute list of link:ctn element.", surf_parse_text[0]);
 	YY_BREAK
-case 145:
+case 151:
 YY_RULE_SETUP
-FAIL("Bad attribute `%s' in `route_element' element start tag.",surf_parse_text);
+FAIL("Bad attribute `%s' in `link:ctn' element start tag.",surf_parse_text);
 	YY_BREAK
-case YY_STATE_EOF(AL_surfxml_route_element):
-FAIL("EOF in attribute list of `route_element' element.");
+case YY_STATE_EOF(AL_surfxml_link_c_ctn):
+FAIL("EOF in attribute list of `link:ctn' element.");
 	YY_BREAK
 
-case 146:
-/* rule 146 can match eol */
+case 152:
+/* rule 152 can match eol */
 YY_RULE_SETUP
 {
   LEAVE;
-  ETag_surfxml_route_element();
+  ETag_surfxml_link_c_ctn();
   popbuffer(); /* attribute */
   switch (YY_START) {
    case S_surfxml_route_1: case S_surfxml_route: case S_surfxml_route_2: SET(S_surfxml_route_2); break;
-   case ROOT_surfxml_route_element: SET(EPILOG); break;
+   case ROOT_surfxml_link_c_ctn: SET(EPILOG); break;
   }
  }
 	YY_BREAK
-case 147:
-/* rule 147 can match eol */
+case 153:
+/* rule 153 can match eol */
 YY_RULE_SETUP
-FAIL("Unexpected end-tag `%s': `</route_element>' expected.",surf_parse_text);
+FAIL("Unexpected end-tag `%s': `</link:ctn>' expected.",surf_parse_text);
 	YY_BREAK
-case 148:
+case 154:
 YY_RULE_SETUP
-FAIL("Unexpected character `%c': `</route_element>' expected.",surf_parse_text[0]);
+FAIL("Unexpected character `%c': `</link:ctn>' expected.",surf_parse_text[0]);
 	YY_BREAK
-case YY_STATE_EOF(E_surfxml_route_element):
-FAIL("Premature EOF: `</route_element>' expected.");
+case YY_STATE_EOF(E_surfxml_link_c_ctn):
+FAIL("Premature EOF: `</link:ctn>' expected.");
 	YY_BREAK
 
-case 149:
-/* rule 149 can match eol */
-YY_RULE_SETUP
-FAIL("Starting tag <process> is not allowed here.");
-	YY_BREAK
-case 150:
-/* rule 150 can match eol */
+case 155:
+/* rule 155 can match eol */
 YY_RULE_SETUP
 {
   AX_surfxml_process_host = 0;
@@ -3553,47 +3685,47 @@ YY_RULE_SETUP
   }
 	YY_BREAK
 
-case 151:
-/* rule 151 can match eol */
+case 156:
+/* rule 156 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE1); BUFFERSET(AX_surfxml_process_host);
 	YY_BREAK
-case 152:
-/* rule 152 can match eol */
+case 157:
+/* rule 157 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE2); BUFFERSET(AX_surfxml_process_host);
 	YY_BREAK
-case 153:
-/* rule 153 can match eol */
+case 158:
+/* rule 158 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE1); BUFFERSET(AX_surfxml_process_function);
 	YY_BREAK
-case 154:
-/* rule 154 can match eol */
+case 159:
+/* rule 159 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE2); BUFFERSET(AX_surfxml_process_function);
 	YY_BREAK
-case 155:
-/* rule 155 can match eol */
+case 160:
+/* rule 160 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE1); BUFFERSET(AX_surfxml_process_start_time);
 	YY_BREAK
-case 156:
-/* rule 156 can match eol */
+case 161:
+/* rule 161 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE2); BUFFERSET(AX_surfxml_process_start_time);
 	YY_BREAK
-case 157:
-/* rule 157 can match eol */
+case 162:
+/* rule 162 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE1); BUFFERSET(AX_surfxml_process_kill_time);
 	YY_BREAK
-case 158:
-/* rule 158 can match eol */
+case 163:
+/* rule 163 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE2); BUFFERSET(AX_surfxml_process_kill_time);
 	YY_BREAK
-case 159:
+case 164:
 YY_RULE_SETUP
 {
   if (!AX_surfxml_process_host) FAIL("Required attribute `host' not set for `process' element.");
@@ -3601,23 +3733,23 @@ YY_RULE_SETUP
   LEAVE; STag_surfxml_process();surfxml_pcdata_ix = 0; ENTER(S_surfxml_process);
  }
 	YY_BREAK
-case 160:
+case 165:
 YY_RULE_SETUP
 {
   if (!AX_surfxml_process_host) FAIL("Required attribute `host' not set for `process' element.");
   if (!AX_surfxml_process_function) FAIL("Required attribute `function' not set for `process' element.");
   LEAVE; STag_surfxml_process(); surfxml_pcdata_ix = 0; ETag_surfxml_process(); popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_5: case S_surfxml_platform_description_3: case S_surfxml_platform_description_1: case S_surfxml_platform_description: case S_surfxml_platform_description_4: SET(S_surfxml_platform_description_5); break;
+   case S_surfxml_platform_description_8: case S_surfxml_platform_description_16: case S_surfxml_platform_description_5: case S_surfxml_platform_description_9: case S_surfxml_platform_description_11: case S_surfxml_platform_description_15: case S_surfxml_platform_description_12: case S_surfxml_platform_description_14: case S_surfxml_platform_description_3: case S_surfxml_platform_description: case S_surfxml_platform_description_6: SET(S_surfxml_platform_description_16); break;
    case ROOT_surfxml_process: SET(EPILOG); break;
   }
  }
 	YY_BREAK
-case 161:
+case 166:
 YY_RULE_SETUP
 FAIL("Unexpected character `%c' in attribute list of process element.", surf_parse_text[0]);
 	YY_BREAK
-case 162:
+case 167:
 YY_RULE_SETUP
 FAIL("Bad attribute `%s' in `process' element start tag.",surf_parse_text);
 	YY_BREAK
@@ -3625,41 +3757,36 @@ case YY_STATE_EOF(AL_surfxml_process):
 FAIL("EOF in attribute list of `process' element.");
 	YY_BREAK
 
-case 163:
-/* rule 163 can match eol */
+case 168:
+/* rule 168 can match eol */
 YY_RULE_SETUP
 {
   LEAVE;
   ETag_surfxml_process();
   popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_5: case S_surfxml_platform_description_3: case S_surfxml_platform_description_1: case S_surfxml_platform_description: case S_surfxml_platform_description_4: SET(S_surfxml_platform_description_5); break;
+   case S_surfxml_platform_description_8: case S_surfxml_platform_description_16: case S_surfxml_platform_description_5: case S_surfxml_platform_description_9: case S_surfxml_platform_description_11: case S_surfxml_platform_description_15: case S_surfxml_platform_description_12: case S_surfxml_platform_description_14: case S_surfxml_platform_description_3: case S_surfxml_platform_description: case S_surfxml_platform_description_6: SET(S_surfxml_platform_description_16); break;
    case ROOT_surfxml_process: SET(EPILOG); break;
   }
  }
 	YY_BREAK
-case 164:
-/* rule 164 can match eol */
+case 169:
+/* rule 169 can match eol */
 YY_RULE_SETUP
 FAIL("Unexpected end-tag `%s': `</process>' expected.",surf_parse_text);
 	YY_BREAK
-case 165:
+case 170:
 YY_RULE_SETUP
 FAIL("Unexpected character `%c': `</process>' expected.",surf_parse_text[0]);
 	YY_BREAK
-case YY_STATE_EOF(S_surfxml_process):
 case YY_STATE_EOF(E_surfxml_process):
+case YY_STATE_EOF(S_surfxml_process):
 case YY_STATE_EOF(S_surfxml_process_2):
 FAIL("Premature EOF: `</process>' expected.");
 	YY_BREAK
 
-case 166:
-/* rule 166 can match eol */
-YY_RULE_SETUP
-FAIL("Starting tag <argument> is not allowed here.");
-	YY_BREAK
-case 167:
-/* rule 167 can match eol */
+case 171:
+/* rule 171 can match eol */
 YY_RULE_SETUP
 {
   AX_surfxml_argument_value = 0;
@@ -3667,24 +3794,24 @@ YY_RULE_SETUP
   }
 	YY_BREAK
 
-case 168:
-/* rule 168 can match eol */
+case 172:
+/* rule 172 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE1); BUFFERSET(AX_surfxml_argument_value);
 	YY_BREAK
-case 169:
-/* rule 169 can match eol */
+case 173:
+/* rule 173 can match eol */
 YY_RULE_SETUP
 ENTER(VALUE2); BUFFERSET(AX_surfxml_argument_value);
 	YY_BREAK
-case 170:
+case 174:
 YY_RULE_SETUP
 {
   if (!AX_surfxml_argument_value) FAIL("Required attribute `value' not set for `argument' element.");
   LEAVE; STag_surfxml_argument();surfxml_pcdata_ix = 0; ENTER(E_surfxml_argument);
  }
 	YY_BREAK
-case 171:
+case 175:
 YY_RULE_SETUP
 {
   if (!AX_surfxml_argument_value) FAIL("Required attribute `value' not set for `argument' element.");
@@ -3695,11 +3822,11 @@ YY_RULE_SETUP
   }
  }
 	YY_BREAK
-case 172:
+case 176:
 YY_RULE_SETUP
 FAIL("Unexpected character `%c' in attribute list of argument element.", surf_parse_text[0]);
 	YY_BREAK
-case 173:
+case 177:
 YY_RULE_SETUP
 FAIL("Bad attribute `%s' in `argument' element start tag.",surf_parse_text);
 	YY_BREAK
@@ -3707,8 +3834,8 @@ case YY_STATE_EOF(AL_surfxml_argument):
 FAIL("EOF in attribute list of `argument' element.");
 	YY_BREAK
 
-case 174:
-/* rule 174 can match eol */
+case 178:
+/* rule 178 can match eol */
 YY_RULE_SETUP
 {
   LEAVE;
@@ -3720,12 +3847,12 @@ YY_RULE_SETUP
   }
  }
 	YY_BREAK
-case 175:
-/* rule 175 can match eol */
+case 179:
+/* rule 179 can match eol */
 YY_RULE_SETUP
 FAIL("Unexpected end-tag `%s': `</argument>' expected.",surf_parse_text);
 	YY_BREAK
-case 176:
+case 180:
 YY_RULE_SETUP
 FAIL("Unexpected character `%c': `</argument>' expected.",surf_parse_text[0]);
 	YY_BREAK
@@ -3735,7 +3862,7 @@ FAIL("Premature EOF: `</argument>' expected.");
 
 /* EPILOG: after the root element. */
 
-case 177:
+case 181:
 YY_RULE_SETUP
 {SET(PROLOG); yyless(0); CLEANUP; return -1;}
 	YY_BREAK
@@ -3746,58 +3873,58 @@ SUCCEED;
 /* CHARACTER DATA. */
 
 /* Non-defined standard entities... */
-case 178:
+case 182:
 YY_RULE_SETUP
 BUFFERPUTC('&');
 	YY_BREAK
-case 179:
+case 183:
 YY_RULE_SETUP
 BUFFERPUTC('<');
 	YY_BREAK
-case 180:
+case 184:
 YY_RULE_SETUP
 BUFFERPUTC('>');
 	YY_BREAK
-case 181:
+case 185:
 YY_RULE_SETUP
 BUFFERPUTC('\'');
 	YY_BREAK
-case 182:
+case 186:
 YY_RULE_SETUP
 BUFFERPUTC('"');
 	YY_BREAK
 /* Character entities. */
-case 183:
+case 187:
 YY_RULE_SETUP
 BUFFERPUTC((unsigned char)atoi(surf_parse_text+2));
 	YY_BREAK
-case 184:
+case 188:
 YY_RULE_SETUP
 BUFFERPUTC((unsigned char)strtol(surf_parse_text+3,NULL,16));
 	YY_BREAK
 
-case 185:
-/* rule 185 can match eol */
-case 186:
-/* rule 186 can match eol */
-case 187:
-/* rule 187 can match eol */
-case 188:
-/* rule 188 can match eol */
+case 189:
+/* rule 189 can match eol */
+case 190:
+/* rule 190 can match eol */
+case 191:
+/* rule 191 can match eol */
+case 192:
+/* rule 192 can match eol */
 YY_RULE_SETUP
 BUFFERPUTC('\n');
 	YY_BREAK
 
-case 189:
+case 193:
 YY_RULE_SETUP
 ENTER(CDATA);
 	YY_BREAK
-case 190:
+case 194:
 YY_RULE_SETUP
 FAIL("Unexpected `]""]>' in character data.");
 	YY_BREAK
 
-case 191:
+case 195:
 YY_RULE_SETUP
 BUFFERDONE; LEAVE;
 	YY_BREAK
@@ -3805,7 +3932,7 @@ case YY_STATE_EOF(VALUE1):
 FAIL("EOF in literal (\"'\" expected).");
 	YY_BREAK
 
-case 192:
+case 196:
 YY_RULE_SETUP
 BUFFERDONE; LEAVE;
 	YY_BREAK
@@ -3813,22 +3940,22 @@ case YY_STATE_EOF(VALUE2):
 FAIL("EOF in literal (`\"' expected).");
 	YY_BREAK
 
-case 193:
-/* rule 193 can match eol */
+case 197:
+/* rule 197 can match eol */
 YY_RULE_SETUP
 BUFFERPUTC(surf_parse_text[0]);
 	YY_BREAK
-case 194:
+case 198:
 YY_RULE_SETUP
 FAIL("Spurious `%c' in character data.",surf_parse_text[0]);
 	YY_BREAK
 
-case 195:
+case 199:
 YY_RULE_SETUP
 LEAVE;
 	YY_BREAK
 /* "]""]"		BUFFERPUTC(surf_parse_text[0]); BUFFERPUTC(surf_parse_text[1]); */
-case 196:
+case 200:
 YY_RULE_SETUP
 BUFFERPUTC(surf_parse_text[0]);
 	YY_BREAK
@@ -3840,27 +3967,34 @@ FAIL("EOF in CDATA section.");
 /* Ideally, this should be replaced by code in flexml.pl that
     generates just the states not covered by other rules. */
 
-case 197:
-/* rule 197 can match eol */
+case 201:
+/* rule 201 can match eol */
 YY_RULE_SETUP
 FAIL("Syntax error on character `%c'.", surf_parse_text[0]);
 	YY_BREAK
 
-case 198:
+case 202:
 YY_RULE_SETUP
 ECHO;
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(ROOT_surfxml_platform_description):
-case YY_STATE_EOF(S_surfxml_platform_description_2):
+case YY_STATE_EOF(S_surfxml_platform_description_1):
 case YY_STATE_EOF(S_surfxml_platform_description_4):
+case YY_STATE_EOF(S_surfxml_platform_description_7):
+case YY_STATE_EOF(S_surfxml_platform_description_10):
+case YY_STATE_EOF(S_surfxml_platform_description_13):
+case YY_STATE_EOF(S_surfxml_platform_description_15):
 case YY_STATE_EOF(ROOT_surfxml_include):
-case YY_STATE_EOF(ROOT_surfxml_cpu):
+case YY_STATE_EOF(ROOT_surfxml_host):
+case YY_STATE_EOF(S_surfxml_host_1):
+case YY_STATE_EOF(ROOT_surfxml_prop):
 case YY_STATE_EOF(ROOT_surfxml_router):
-case YY_STATE_EOF(ROOT_surfxml_network_link):
+case YY_STATE_EOF(ROOT_surfxml_link):
+case YY_STATE_EOF(S_surfxml_link_1):
 case YY_STATE_EOF(ROOT_surfxml_route):
 case YY_STATE_EOF(S_surfxml_route_1):
-case YY_STATE_EOF(ROOT_surfxml_route_element):
+case YY_STATE_EOF(ROOT_surfxml_link_c_ctn):
 case YY_STATE_EOF(ROOT_surfxml_process):
 case YY_STATE_EOF(S_surfxml_process_1):
 case YY_STATE_EOF(ROOT_surfxml_argument):
@@ -4147,7 +4281,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 >= 1531 )
+			if ( yy_current_state >= 1517 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -4175,11 +4309,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 >= 1531 )
+		if ( yy_current_state >= 1517 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 1530);
+	yy_is_jam = (yy_current_state == 1516);
 
 	return yy_is_jam ? 0 : yy_current_state;
 }
diff --git a/src/surf/surfxml.dtd b/src/surf/surfxml.dtd
index ead9d2a249..c023a7cf37 100644
--- a/src/surf/surfxml.dtd
+++ b/src/surf/surfxml.dtd
@@ -1,36 +1,40 @@
 <!-- Small DTD for SURF based tools. -->
-<!ELEMENT platform_description ((include|cpu|router|network_link)*,(include|route|process)*)>
+<!ELEMENT platform_description (include*|(host*,router*,link*,route*,process*))>
 <!ATTLIST platform_description version CDATA "0.0">
 
 <!ELEMENT include EMPTY>
 <!ATTLIST include file CDATA #REQUIRED>
 
-<!ELEMENT cpu EMPTY>
-<!ATTLIST cpu name CDATA #REQUIRED>
-<!ATTLIST cpu power CDATA #REQUIRED>
-<!ATTLIST cpu availability CDATA "1.0">
-<!ATTLIST cpu availability_file CDATA "">
-<!ATTLIST cpu state (ON|OFF) "ON">
-<!ATTLIST cpu state_file CDATA "">
-<!ATTLIST cpu interference_send CDATA "1.0">
-<!ATTLIST cpu interference_recv CDATA "1.0">
-<!ATTLIST cpu interference_send_recv CDATA "1.0">
-<!ATTLIST cpu max_outgoing_rate CDATA "-1.0">
+<!ELEMENT host (prop*)>
+<!ATTLIST host id CDATA #REQUIRED>
+<!ATTLIST host power CDATA #REQUIRED>
+<!ATTLIST host availability CDATA "1.0">
+<!ATTLIST host availability_file CDATA "">
+<!ATTLIST host state (ON|OFF) "ON">
+<!ATTLIST host state_file CDATA "">
+<!ATTLIST host interference_send CDATA "1.0">
+<!ATTLIST host interference_recv CDATA "1.0">
+<!ATTLIST host interference_send_recv CDATA "1.0">
+<!ATTLIST host max_outgoing_rate CDATA "-1.0">
+
+<!ELEMENT prop EMPTY>
+<!ATTLIST prop id CDATA #REQUIRED>
+<!ATTLIST prop value CDATA #REQUIRED>
 
 <!ELEMENT router EMPTY>
-<!ATTLIST router name CDATA #REQUIRED>
-
-<!ELEMENT network_link EMPTY>
-<!ATTLIST network_link name CDATA #REQUIRED>
-<!ATTLIST network_link bandwidth CDATA  #REQUIRED>
-<!ATTLIST network_link bandwidth_file CDATA "">
-<!ATTLIST network_link latency CDATA "0.0">
-<!ATTLIST network_link latency_file CDATA "">
-<!ATTLIST network_link state (ON|OFF) "ON">
-<!ATTLIST network_link state_file CDATA "">
-<!ATTLIST network_link sharing_policy (SHARED|FATPIPE) "SHARED">
-
-<!ELEMENT route (route_element*)>
+<!ATTLIST router id CDATA #REQUIRED>
+
+<!ELEMENT link (prop*)>
+<!ATTLIST link id CDATA #REQUIRED>
+<!ATTLIST link bandwidth CDATA  #REQUIRED>
+<!ATTLIST link bandwidth_file CDATA "">
+<!ATTLIST link latency CDATA "0.0">
+<!ATTLIST link latency_file CDATA "">
+<!ATTLIST link state (ON|OFF) "ON">
+<!ATTLIST link state_file CDATA "">
+<!ATTLIST link sharing_policy (SHARED|FATPIPE) "SHARED">
+
+<!ELEMENT route (link:ctn*)>
 <!ATTLIST route src CDATA #REQUIRED>
 <!ATTLIST route dst CDATA #REQUIRED>
 <!ATTLIST route impact_on_src CDATA "0.0">
@@ -38,10 +42,10 @@
 <!ATTLIST route impact_on_src_with_other_recv CDATA "0.0">
 <!ATTLIST route impact_on_dst_with_other_send CDATA "0.0">
 
-<!ELEMENT route_element EMPTY>
-<!ATTLIST route_element name CDATA #REQUIRED>
+<!ELEMENT link:ctn EMPTY>
+<!ATTLIST link:ctn id CDATA #REQUIRED>
 
-<!ELEMENT process (argument*)>
+<!ELEMENT process ((argument|prop)*)>
 <!ATTLIST process host CDATA #REQUIRED>
 <!ATTLIST process function CDATA #REQUIRED>
 <!ATTLIST process start_time CDATA "-1.0">
diff --git a/src/surf/surfxml.l b/src/surf/surfxml.l
index 32a5ed4688..90cf84778e 100644
--- a/src/surf/surfxml.l
+++ b/src/surf/surfxml.l
@@ -1,10 +1,10 @@
 /* Validating XML processor for surf/surfxml.dtd.
- * Generated 2007/10/12 10:23:15.
+ * Generated 2007/10/23 11:08:07.
  *
  * This program was generated with the FleXML XML processor generator.
  * FleXML is Copyright (C) 1999-2005 Kristoffer Rose.  All rights reserved.
  * FleXML is Copyright (C) 2003-2006 Martin Quinson.  All rights reserved.
- * (Id: flexml.pl,v 1.62 2007/10/11 10:00:14 mquinson Exp).
+ * (Id: flexml.pl,v 1.61 2006/09/13 16:34:33 wdowling Exp).
  * 
  * There are two, intertwined parts to this program, part A and part B.
  *
@@ -49,27 +49,18 @@
 
 /* Version strings. */
 const char rcs_surfxml_flexml_skeleton[] =
- "$" "Id: skel,v 1.40 2007/10/11 09:57:24 mquinson Exp $";
+ "$" "Id: skel,v 1.38 2006/09/12 18:05:45 wdowling Exp $";
 const char rcs_surfxml_flexml[] =
- "$" "Id: flexml.pl,v 1.62 2007/10/11 10:00:14 mquinson Exp $";
+ "$" "Id: flexml.pl,v 1.61 2006/09/13 16:34:33 wdowling Exp $";
 
 /* ANSI headers. */
-#include <stdlib.h> /* for realloc() -- needed here when using flex 2.5.4 */
+#include <unistd.h>
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 #include <stdarg.h>
 #include <ctype.h>
-     
-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)
-# ifndef __STRICT_ANSI__
-#  include <io.h>
-#  include <process.h>
-# endif
-#else
-# include <unistd.h>
-#endif
-     
+
 #ifndef FLEXML_INDEXSTACKSIZE
 #define FLEXML_INDEXSTACKSIZE 1000
 #endif
@@ -86,72 +77,76 @@ const char rcs_surfxml_flexml[] =
 int surfxml_pcdata_ix;
 extern char *surfxml_bufferstack;
 #define surfxml_pcdata (surfxml_bufferstack + surfxml_pcdata_ix)
-AT_surfxml_network_link_bandwidth AX_surfxml_network_link_bandwidth;
-#define A_surfxml_network_link_bandwidth (surfxml_bufferstack + AX_surfxml_network_link_bandwidth)
-AT_surfxml_router_name AX_surfxml_router_name;
-#define A_surfxml_router_name (surfxml_bufferstack + AX_surfxml_router_name)
+AT_surfxml_link_id AX_surfxml_link_id;
+#define A_surfxml_link_id (surfxml_bufferstack + AX_surfxml_link_id)
+AT_surfxml_prop_id AX_surfxml_prop_id;
+#define A_surfxml_prop_id (surfxml_bufferstack + AX_surfxml_prop_id)
+AT_surfxml_host_interference_recv AX_surfxml_host_interference_recv;
+#define A_surfxml_host_interference_recv (surfxml_bufferstack + AX_surfxml_host_interference_recv)
+AT_surfxml_host_id AX_surfxml_host_id;
+#define A_surfxml_host_id (surfxml_bufferstack + AX_surfxml_host_id)
+AT_surfxml_link_latency_file AX_surfxml_link_latency_file;
+#define A_surfxml_link_latency_file (surfxml_bufferstack + AX_surfxml_link_latency_file)
 AT_surfxml_process_host AX_surfxml_process_host;
 #define A_surfxml_process_host (surfxml_bufferstack + AX_surfxml_process_host)
-AT_surfxml_network_link_latency_file AX_surfxml_network_link_latency_file;
-#define A_surfxml_network_link_latency_file (surfxml_bufferstack + AX_surfxml_network_link_latency_file)
+AT_surfxml_host_availability_file AX_surfxml_host_availability_file;
+#define A_surfxml_host_availability_file (surfxml_bufferstack + AX_surfxml_host_availability_file)
+AT_surfxml_host_state AX_surfxml_host_state;
+#define A_surfxml_host_state AX_surfxml_host_state
+AT_surfxml_host_interference_send_recv AX_surfxml_host_interference_send_recv;
+#define A_surfxml_host_interference_send_recv (surfxml_bufferstack + AX_surfxml_host_interference_send_recv)
 AT_surfxml_route_impact_on_dst_with_other_send AX_surfxml_route_impact_on_dst_with_other_send;
 #define A_surfxml_route_impact_on_dst_with_other_send (surfxml_bufferstack + AX_surfxml_route_impact_on_dst_with_other_send)
-AT_surfxml_cpu_interference_send_recv AX_surfxml_cpu_interference_send_recv;
-#define A_surfxml_cpu_interference_send_recv (surfxml_bufferstack + AX_surfxml_cpu_interference_send_recv)
+AT_surfxml_host_interference_send AX_surfxml_host_interference_send;
+#define A_surfxml_host_interference_send (surfxml_bufferstack + AX_surfxml_host_interference_send)
 AT_surfxml_route_impact_on_dst AX_surfxml_route_impact_on_dst;
 #define A_surfxml_route_impact_on_dst (surfxml_bufferstack + AX_surfxml_route_impact_on_dst)
 AT_surfxml_platform_description_version AX_surfxml_platform_description_version;
 #define A_surfxml_platform_description_version (surfxml_bufferstack + AX_surfxml_platform_description_version)
+AT_surfxml_prop_value AX_surfxml_prop_value;
+#define A_surfxml_prop_value (surfxml_bufferstack + AX_surfxml_prop_value)
 AT_surfxml_route_impact_on_src_with_other_recv AX_surfxml_route_impact_on_src_with_other_recv;
 #define A_surfxml_route_impact_on_src_with_other_recv (surfxml_bufferstack + AX_surfxml_route_impact_on_src_with_other_recv)
-AT_surfxml_route_element_name AX_surfxml_route_element_name;
-#define A_surfxml_route_element_name (surfxml_bufferstack + AX_surfxml_route_element_name)
+AT_surfxml_host_power AX_surfxml_host_power;
+#define A_surfxml_host_power (surfxml_bufferstack + AX_surfxml_host_power)
+AT_surfxml_link_state_file AX_surfxml_link_state_file;
+#define A_surfxml_link_state_file (surfxml_bufferstack + AX_surfxml_link_state_file)
+AT_surfxml_router_id AX_surfxml_router_id;
+#define A_surfxml_router_id (surfxml_bufferstack + AX_surfxml_router_id)
 AT_surfxml_process_start_time AX_surfxml_process_start_time;
 #define A_surfxml_process_start_time (surfxml_bufferstack + AX_surfxml_process_start_time)
 AT_surfxml_process_function AX_surfxml_process_function;
 #define A_surfxml_process_function (surfxml_bufferstack + AX_surfxml_process_function)
-AT_surfxml_cpu_state AX_surfxml_cpu_state;
-#define A_surfxml_cpu_state AX_surfxml_cpu_state
-AT_surfxml_cpu_interference_send AX_surfxml_cpu_interference_send;
-#define A_surfxml_cpu_interference_send (surfxml_bufferstack + AX_surfxml_cpu_interference_send)
-AT_surfxml_network_link_bandwidth_file AX_surfxml_network_link_bandwidth_file;
-#define A_surfxml_network_link_bandwidth_file (surfxml_bufferstack + AX_surfxml_network_link_bandwidth_file)
-AT_surfxml_cpu_name AX_surfxml_cpu_name;
-#define A_surfxml_cpu_name (surfxml_bufferstack + AX_surfxml_cpu_name)
+AT_surfxml_host_max_outgoing_rate AX_surfxml_host_max_outgoing_rate;
+#define A_surfxml_host_max_outgoing_rate (surfxml_bufferstack + AX_surfxml_host_max_outgoing_rate)
+AT_surfxml_link_sharing_policy AX_surfxml_link_sharing_policy;
+#define A_surfxml_link_sharing_policy AX_surfxml_link_sharing_policy
+AT_surfxml_link_c_ctn_id AX_surfxml_link_c_ctn_id;
+#define A_surfxml_link_c_ctn_id (surfxml_bufferstack + AX_surfxml_link_c_ctn_id)
 AT_surfxml_process_kill_time AX_surfxml_process_kill_time;
 #define A_surfxml_process_kill_time (surfxml_bufferstack + AX_surfxml_process_kill_time)
-AT_surfxml_network_link_state AX_surfxml_network_link_state;
-#define A_surfxml_network_link_state AX_surfxml_network_link_state
-AT_surfxml_cpu_availability_file AX_surfxml_cpu_availability_file;
-#define A_surfxml_cpu_availability_file (surfxml_bufferstack + AX_surfxml_cpu_availability_file)
+AT_surfxml_host_availability AX_surfxml_host_availability;
+#define A_surfxml_host_availability (surfxml_bufferstack + AX_surfxml_host_availability)
 AT_surfxml_argument_value AX_surfxml_argument_value;
 #define A_surfxml_argument_value (surfxml_bufferstack + AX_surfxml_argument_value)
+AT_surfxml_link_state AX_surfxml_link_state;
+#define A_surfxml_link_state AX_surfxml_link_state
 AT_surfxml_route_src AX_surfxml_route_src;
 #define A_surfxml_route_src (surfxml_bufferstack + AX_surfxml_route_src)
 AT_surfxml_route_impact_on_src AX_surfxml_route_impact_on_src;
 #define A_surfxml_route_impact_on_src (surfxml_bufferstack + AX_surfxml_route_impact_on_src)
-AT_surfxml_cpu_max_outgoing_rate AX_surfxml_cpu_max_outgoing_rate;
-#define A_surfxml_cpu_max_outgoing_rate (surfxml_bufferstack + AX_surfxml_cpu_max_outgoing_rate)
-AT_surfxml_cpu_availability AX_surfxml_cpu_availability;
-#define A_surfxml_cpu_availability (surfxml_bufferstack + AX_surfxml_cpu_availability)
-AT_surfxml_cpu_interference_recv AX_surfxml_cpu_interference_recv;
-#define A_surfxml_cpu_interference_recv (surfxml_bufferstack + AX_surfxml_cpu_interference_recv)
-AT_surfxml_network_link_name AX_surfxml_network_link_name;
-#define A_surfxml_network_link_name (surfxml_bufferstack + AX_surfxml_network_link_name)
-AT_surfxml_cpu_power AX_surfxml_cpu_power;
-#define A_surfxml_cpu_power (surfxml_bufferstack + AX_surfxml_cpu_power)
+AT_surfxml_link_bandwidth AX_surfxml_link_bandwidth;
+#define A_surfxml_link_bandwidth (surfxml_bufferstack + AX_surfxml_link_bandwidth)
+AT_surfxml_link_latency AX_surfxml_link_latency;
+#define A_surfxml_link_latency (surfxml_bufferstack + AX_surfxml_link_latency)
 AT_surfxml_include_file AX_surfxml_include_file;
 #define A_surfxml_include_file (surfxml_bufferstack + AX_surfxml_include_file)
-AT_surfxml_network_link_sharing_policy AX_surfxml_network_link_sharing_policy;
-#define A_surfxml_network_link_sharing_policy AX_surfxml_network_link_sharing_policy
+AT_surfxml_link_bandwidth_file AX_surfxml_link_bandwidth_file;
+#define A_surfxml_link_bandwidth_file (surfxml_bufferstack + AX_surfxml_link_bandwidth_file)
+AT_surfxml_host_state_file AX_surfxml_host_state_file;
+#define A_surfxml_host_state_file (surfxml_bufferstack + AX_surfxml_host_state_file)
 AT_surfxml_route_dst AX_surfxml_route_dst;
 #define A_surfxml_route_dst (surfxml_bufferstack + AX_surfxml_route_dst)
-AT_surfxml_network_link_latency AX_surfxml_network_link_latency;
-#define A_surfxml_network_link_latency (surfxml_bufferstack + AX_surfxml_network_link_latency)
-AT_surfxml_cpu_state_file AX_surfxml_cpu_state_file;
-#define A_surfxml_cpu_state_file (surfxml_bufferstack + AX_surfxml_cpu_state_file)
-AT_surfxml_network_link_state_file AX_surfxml_network_link_state_file;
-#define A_surfxml_network_link_state_file (surfxml_bufferstack + AX_surfxml_network_link_state_file)
 
 /* XML state. */
 #ifdef FLEX_DEBUG
@@ -313,13 +308,14 @@ Literal		\'[^'']*\'|\"[^""]*\"
  * IMPOSSIBLE	dummy to permit disabling rules; must be last
  */
 %x PROLOG DOCTYPE EPILOG INCOMMENT INPI VALUE1 VALUE2 CDATA
-%x ROOT_surfxml_platform_description AL_surfxml_platform_description S_surfxml_platform_description S_surfxml_platform_description_1 S_surfxml_platform_description_2 S_surfxml_platform_description_3 S_surfxml_platform_description_4 S_surfxml_platform_description_5 E_surfxml_platform_description
+%x ROOT_surfxml_platform_description AL_surfxml_platform_description S_surfxml_platform_description S_surfxml_platform_description_1 S_surfxml_platform_description_2 S_surfxml_platform_description_3 S_surfxml_platform_description_4 S_surfxml_platform_description_5 S_surfxml_platform_description_6 S_surfxml_platform_description_7 S_surfxml_platform_description_8 S_surfxml_platform_description_9 S_surfxml_platform_description_10 S_surfxml_platform_description_11 S_surfxml_platform_description_12 S_surfxml_platform_description_13 S_surfxml_platform_description_14 S_surfxml_platform_description_15 S_surfxml_platform_description_16 E_surfxml_platform_description
 %x ROOT_surfxml_include AL_surfxml_include E_surfxml_include
-%x ROOT_surfxml_cpu AL_surfxml_cpu E_surfxml_cpu
+%x ROOT_surfxml_host AL_surfxml_host S_surfxml_host S_surfxml_host_1 S_surfxml_host_2 E_surfxml_host
+%x ROOT_surfxml_prop AL_surfxml_prop E_surfxml_prop
 %x ROOT_surfxml_router AL_surfxml_router E_surfxml_router
-%x ROOT_surfxml_network_link AL_surfxml_network_link E_surfxml_network_link
+%x ROOT_surfxml_link AL_surfxml_link S_surfxml_link S_surfxml_link_1 S_surfxml_link_2 E_surfxml_link
 %x ROOT_surfxml_route AL_surfxml_route S_surfxml_route S_surfxml_route_1 S_surfxml_route_2 E_surfxml_route
-%x ROOT_surfxml_route_element AL_surfxml_route_element E_surfxml_route_element
+%x ROOT_surfxml_link_c_ctn AL_surfxml_link_c_ctn E_surfxml_link_c_ctn
 %x ROOT_surfxml_process AL_surfxml_process S_surfxml_process S_surfxml_process_1 S_surfxml_process_2 E_surfxml_process
 %x ROOT_surfxml_argument AL_surfxml_argument E_surfxml_argument
 %x IMPOSSIBLE
@@ -381,28 +377,48 @@ const char* *surfxml_statenames=NULL;
   surfxml_statenames[S_surfxml_platform_description_3] = "platform_description";
   surfxml_statenames[S_surfxml_platform_description_4] = "platform_description";
   surfxml_statenames[S_surfxml_platform_description_5] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_6] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_7] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_8] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_9] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_10] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_11] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_12] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_13] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_14] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_15] = "platform_description";
+  surfxml_statenames[S_surfxml_platform_description_16] = "platform_description";
   surfxml_statenames[E_surfxml_platform_description] = "platform_description";
   surfxml_statenames[ROOT_surfxml_include] = NULL;
   surfxml_statenames[AL_surfxml_include] = NULL;
   surfxml_statenames[E_surfxml_include] = "include";
-  surfxml_statenames[ROOT_surfxml_cpu] = NULL;
-  surfxml_statenames[AL_surfxml_cpu] = NULL;
-  surfxml_statenames[E_surfxml_cpu] = "cpu";
+  surfxml_statenames[ROOT_surfxml_host] = NULL;
+  surfxml_statenames[AL_surfxml_host] = NULL;
+  surfxml_statenames[S_surfxml_host] = "host";
+  surfxml_statenames[S_surfxml_host_1] = "host";
+  surfxml_statenames[S_surfxml_host_2] = "host";
+  surfxml_statenames[E_surfxml_host] = "host";
+  surfxml_statenames[ROOT_surfxml_prop] = NULL;
+  surfxml_statenames[AL_surfxml_prop] = NULL;
+  surfxml_statenames[E_surfxml_prop] = "prop";
   surfxml_statenames[ROOT_surfxml_router] = NULL;
   surfxml_statenames[AL_surfxml_router] = NULL;
   surfxml_statenames[E_surfxml_router] = "router";
-  surfxml_statenames[ROOT_surfxml_network_link] = NULL;
-  surfxml_statenames[AL_surfxml_network_link] = NULL;
-  surfxml_statenames[E_surfxml_network_link] = "network_link";
+  surfxml_statenames[ROOT_surfxml_link] = NULL;
+  surfxml_statenames[AL_surfxml_link] = NULL;
+  surfxml_statenames[S_surfxml_link] = "link";
+  surfxml_statenames[S_surfxml_link_1] = "link";
+  surfxml_statenames[S_surfxml_link_2] = "link";
+  surfxml_statenames[E_surfxml_link] = "link";
   surfxml_statenames[ROOT_surfxml_route] = NULL;
   surfxml_statenames[AL_surfxml_route] = NULL;
   surfxml_statenames[S_surfxml_route] = "route";
   surfxml_statenames[S_surfxml_route_1] = "route";
   surfxml_statenames[S_surfxml_route_2] = "route";
   surfxml_statenames[E_surfxml_route] = "route";
-  surfxml_statenames[ROOT_surfxml_route_element] = NULL;
-  surfxml_statenames[AL_surfxml_route_element] = NULL;
-  surfxml_statenames[E_surfxml_route_element] = "route_element";
+  surfxml_statenames[ROOT_surfxml_link_c_ctn] = NULL;
+  surfxml_statenames[AL_surfxml_link_c_ctn] = NULL;
+  surfxml_statenames[E_surfxml_link_c_ctn] = "link:ctn";
   surfxml_statenames[ROOT_surfxml_process] = NULL;
   surfxml_statenames[AL_surfxml_process] = NULL;
   surfxml_statenames[S_surfxml_process] = "process";
@@ -416,7 +432,7 @@ const char* *surfxml_statenames=NULL;
 
  /* COMMENTS and PIs: handled uniformly for efficiency. */
 
-<ROOT_surfxml_platform_description,AL_surfxml_platform_description,S_surfxml_platform_description,S_surfxml_platform_description_1,S_surfxml_platform_description_2,S_surfxml_platform_description_3,S_surfxml_platform_description_4,S_surfxml_platform_description_5,E_surfxml_platform_description,ROOT_surfxml_include,AL_surfxml_include,E_surfxml_include,ROOT_surfxml_cpu,AL_surfxml_cpu,E_surfxml_cpu,ROOT_surfxml_router,AL_surfxml_router,E_surfxml_router,ROOT_surfxml_network_link,AL_surfxml_network_link,E_surfxml_network_link,ROOT_surfxml_route,AL_surfxml_route,S_surfxml_route,S_surfxml_route_1,S_surfxml_route_2,E_surfxml_route,ROOT_surfxml_route_element,AL_surfxml_route_element,E_surfxml_route_element,ROOT_surfxml_process,AL_surfxml_process,S_surfxml_process,S_surfxml_process_1,S_surfxml_process_2,E_surfxml_process,ROOT_surfxml_argument,AL_surfxml_argument,E_surfxml_argument,PROLOG,DOCTYPE,EPILOG>{
+<ROOT_surfxml_platform_description,AL_surfxml_platform_description,S_surfxml_platform_description,S_surfxml_platform_description_1,S_surfxml_platform_description_2,S_surfxml_platform_description_3,S_surfxml_platform_description_4,S_surfxml_platform_description_5,S_surfxml_platform_description_6,S_surfxml_platform_description_7,S_surfxml_platform_description_8,S_surfxml_platform_description_9,S_surfxml_platform_description_10,S_surfxml_platform_description_11,S_surfxml_platform_description_12,S_surfxml_platform_description_13,S_surfxml_platform_description_14,S_surfxml_platform_description_15,S_surfxml_platform_description_16,E_surfxml_platform_description,ROOT_surfxml_include,AL_surfxml_include,E_surfxml_include,ROOT_surfxml_host,AL_surfxml_host,S_surfxml_host,S_surfxml_host_1,S_surfxml_host_2,E_surfxml_host,ROOT_surfxml_prop,AL_surfxml_prop,E_surfxml_prop,ROOT_surfxml_router,AL_surfxml_router,E_surfxml_router,ROOT_surfxml_link,AL_surfxml_link,S_surfxml_link,S_surfxml_link_1,S_surfxml_link_2,E_surfxml_link,ROOT_surfxml_route,AL_surfxml_route,S_surfxml_route,S_surfxml_route_1,S_surfxml_route_2,E_surfxml_route,ROOT_surfxml_link_c_ctn,AL_surfxml_link_c_ctn,E_surfxml_link_c_ctn,ROOT_surfxml_process,AL_surfxml_process,S_surfxml_process,S_surfxml_process_1,S_surfxml_process_2,E_surfxml_process,ROOT_surfxml_argument,AL_surfxml_argument,E_surfxml_argument,PROLOG,DOCTYPE,EPILOG>{
  "<!--" ENTER(INCOMMENT);
  "<?" ENTER(INPI);
 }
@@ -436,7 +452,7 @@ const char* *surfxml_statenames=NULL;
 
  /* SPACES: skipped uniformly */
 
-<ROOT_surfxml_platform_description,AL_surfxml_platform_description,S_surfxml_platform_description,S_surfxml_platform_description_1,S_surfxml_platform_description_2,S_surfxml_platform_description_3,S_surfxml_platform_description_4,S_surfxml_platform_description_5,E_surfxml_platform_description,ROOT_surfxml_include,AL_surfxml_include,E_surfxml_include,ROOT_surfxml_cpu,AL_surfxml_cpu,E_surfxml_cpu,ROOT_surfxml_router,AL_surfxml_router,E_surfxml_router,ROOT_surfxml_network_link,AL_surfxml_network_link,E_surfxml_network_link,ROOT_surfxml_route,AL_surfxml_route,S_surfxml_route,S_surfxml_route_1,S_surfxml_route_2,E_surfxml_route,ROOT_surfxml_route_element,AL_surfxml_route_element,E_surfxml_route_element,ROOT_surfxml_process,AL_surfxml_process,S_surfxml_process,S_surfxml_process_1,S_surfxml_process_2,E_surfxml_process,ROOT_surfxml_argument,AL_surfxml_argument,E_surfxml_argument,PROLOG,DOCTYPE,EPILOG>{S} SKIP;
+<ROOT_surfxml_platform_description,AL_surfxml_platform_description,S_surfxml_platform_description,S_surfxml_platform_description_1,S_surfxml_platform_description_2,S_surfxml_platform_description_3,S_surfxml_platform_description_4,S_surfxml_platform_description_5,S_surfxml_platform_description_6,S_surfxml_platform_description_7,S_surfxml_platform_description_8,S_surfxml_platform_description_9,S_surfxml_platform_description_10,S_surfxml_platform_description_11,S_surfxml_platform_description_12,S_surfxml_platform_description_13,S_surfxml_platform_description_14,S_surfxml_platform_description_15,S_surfxml_platform_description_16,E_surfxml_platform_description,ROOT_surfxml_include,AL_surfxml_include,E_surfxml_include,ROOT_surfxml_host,AL_surfxml_host,S_surfxml_host,S_surfxml_host_1,S_surfxml_host_2,E_surfxml_host,ROOT_surfxml_prop,AL_surfxml_prop,E_surfxml_prop,ROOT_surfxml_router,AL_surfxml_router,E_surfxml_router,ROOT_surfxml_link,AL_surfxml_link,S_surfxml_link,S_surfxml_link_1,S_surfxml_link_2,E_surfxml_link,ROOT_surfxml_route,AL_surfxml_route,S_surfxml_route,S_surfxml_route_1,S_surfxml_route_2,E_surfxml_route,ROOT_surfxml_link_c_ctn,AL_surfxml_link_c_ctn,E_surfxml_link_c_ctn,ROOT_surfxml_process,AL_surfxml_process,S_surfxml_process,S_surfxml_process_1,S_surfxml_process_2,E_surfxml_process,ROOT_surfxml_argument,AL_surfxml_argument,E_surfxml_argument,PROLOG,DOCTYPE,EPILOG>{S} SKIP;
 
  /* PROLOG: determine root element and process it. */
 
@@ -446,14 +462,15 @@ const char* *surfxml_statenames=NULL;
 }
 
 <PROLOG,DOCTYPE>{
- "<!DOCTYPE"{S}"cpu"{S}SYSTEM{S}("'surfxml.dtd'"|"\"surfxml.dtd\""){s}">" SET(ROOT_surfxml_cpu);
+ "<!DOCTYPE"{S}"link"{S}SYSTEM{S}("'surfxml.dtd'"|"\"surfxml.dtd\""){s}">" SET(ROOT_surfxml_link);
  "<!DOCTYPE"{S}"include"{S}SYSTEM{S}("'surfxml.dtd'"|"\"surfxml.dtd\""){s}">" SET(ROOT_surfxml_include);
  "<!DOCTYPE"{S}"route"{S}SYSTEM{S}("'surfxml.dtd'"|"\"surfxml.dtd\""){s}">" SET(ROOT_surfxml_route);
- "<!DOCTYPE"{S}"network_link"{S}SYSTEM{S}("'surfxml.dtd'"|"\"surfxml.dtd\""){s}">" SET(ROOT_surfxml_network_link);
  "<!DOCTYPE"{S}"process"{S}SYSTEM{S}("'surfxml.dtd'"|"\"surfxml.dtd\""){s}">" SET(ROOT_surfxml_process);
+ "<!DOCTYPE"{S}"link:ctn"{S}SYSTEM{S}("'surfxml.dtd'"|"\"surfxml.dtd\""){s}">" SET(ROOT_surfxml_link_c_ctn);
  "<!DOCTYPE"{S}"router"{S}SYSTEM{S}("'surfxml.dtd'"|"\"surfxml.dtd\""){s}">" SET(ROOT_surfxml_router);
+ "<!DOCTYPE"{S}"host"{S}SYSTEM{S}("'surfxml.dtd'"|"\"surfxml.dtd\""){s}">" SET(ROOT_surfxml_host);
  "<!DOCTYPE"{S}"argument"{S}SYSTEM{S}("'surfxml.dtd'"|"\"surfxml.dtd\""){s}">" SET(ROOT_surfxml_argument);
- "<!DOCTYPE"{S}"route_element"{S}SYSTEM{S}("'surfxml.dtd'"|"\"surfxml.dtd\""){s}">" SET(ROOT_surfxml_route_element);
+ "<!DOCTYPE"{S}"prop"{S}SYSTEM{S}("'surfxml.dtd'"|"\"surfxml.dtd\""){s}">" SET(ROOT_surfxml_prop);
  "<!DOCTYPE"{S}"platform_description"{S}SYSTEM{S}("'surfxml.dtd'"|"\"surfxml.dtd\""){s}">" SET(ROOT_surfxml_platform_description);
  "<!"[^>-][^>]*">" FAIL("Bad declaration %s.",yytext);
  . 		FAIL("Unexpected character `%c' in prolog.", yytext[0]);
@@ -464,8 +481,6 @@ const char* *surfxml_statenames=NULL;
 
  /* <!-- Small DTD for SURF based tools. -->  */
 
-<S_surfxml_platform_description_4,E_surfxml_process,S_surfxml_platform_description_5,S_surfxml_process,S_surfxml_route_2,S_surfxml_platform_description_3,E_surfxml_route,S_surfxml_platform_description,S_surfxml_route_1,S_surfxml_platform_description_1,S_surfxml_process_1,E_surfxml_platform_description,S_surfxml_platform_description_2,S_surfxml_process_2,S_surfxml_route>"<platform_description"{s} FAIL("Starting tag <platform_description> is not allowed here.");
-
 <ROOT_surfxml_platform_description>"<platform_description"{s} {
   AX_surfxml_platform_description_version = 1;
   ENTER(AL_surfxml_platform_description); pushbuffer(0);
@@ -489,7 +504,7 @@ const char* *surfxml_statenames=NULL;
  <<EOF>> FAIL("EOF in attribute list of `platform_description' element.");
 }
 
-<E_surfxml_platform_description,S_surfxml_platform_description_5,S_surfxml_platform_description_3,S_surfxml_platform_description_1,S_surfxml_platform_description>{
+<S_surfxml_platform_description_8,S_surfxml_platform_description_16,E_surfxml_platform_description,S_surfxml_platform_description_2,S_surfxml_platform_description_5,S_surfxml_platform_description_9,S_surfxml_platform_description_11,S_surfxml_platform_description_12,S_surfxml_platform_description_14,S_surfxml_platform_description_3,S_surfxml_platform_description,S_surfxml_platform_description_6>{
  "</platform_description"{s}">" {
   LEAVE;
   ETag_surfxml_platform_description();
@@ -503,9 +518,7 @@ const char* *surfxml_statenames=NULL;
  <<EOF>> FAIL("Premature EOF: `</platform_description>' expected.");
 }
 
-<E_surfxml_process,S_surfxml_process,S_surfxml_route_2,E_surfxml_route,S_surfxml_route_1,S_surfxml_process_1,E_surfxml_platform_description,S_surfxml_process_2,S_surfxml_route>"<include"{s} FAIL("Starting tag <include> is not allowed here.");
-
-<ROOT_surfxml_include,S_surfxml_platform_description_2,S_surfxml_platform_description_5,S_surfxml_platform_description_3,S_surfxml_platform_description_1,S_surfxml_platform_description,S_surfxml_platform_description_4>"<include"{s} {
+<ROOT_surfxml_include,S_surfxml_platform_description_2,S_surfxml_platform_description_1,S_surfxml_platform_description>"<include"{s} {
   AX_surfxml_include_file = 0;
   ENTER(AL_surfxml_include); pushbuffer(0);
   }
@@ -522,9 +535,8 @@ const char* *surfxml_statenames=NULL;
   if (!AX_surfxml_include_file) FAIL("Required attribute `file' not set for `include' element.");
   LEAVE; STag_surfxml_include(); surfxml_pcdata_ix = 0; ETag_surfxml_include(); popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_2: SET(S_surfxml_platform_description_3); break;
+   case S_surfxml_platform_description_2: case S_surfxml_platform_description_1: case S_surfxml_platform_description: SET(S_surfxml_platform_description_2); break;
    case ROOT_surfxml_include: SET(EPILOG); break;
-   case S_surfxml_platform_description_5: case S_surfxml_platform_description_3: case S_surfxml_platform_description_1: case S_surfxml_platform_description: case S_surfxml_platform_description_4: SET(S_surfxml_platform_description_5); break;
   }
  }
  .       FAIL("Unexpected character `%c' in attribute list of include element.", yytext[0]);
@@ -538,9 +550,8 @@ const char* *surfxml_statenames=NULL;
   ETag_surfxml_include();
   popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_2: SET(S_surfxml_platform_description_3); break;
+   case S_surfxml_platform_description_2: case S_surfxml_platform_description_1: case S_surfxml_platform_description: SET(S_surfxml_platform_description_2); break;
    case ROOT_surfxml_include: SET(EPILOG); break;
-   case S_surfxml_platform_description_5: case S_surfxml_platform_description_3: case S_surfxml_platform_description_1: case S_surfxml_platform_description: case S_surfxml_platform_description_4: SET(S_surfxml_platform_description_5); break;
   }
  }
  "</"{Name}{s}">" FAIL("Unexpected end-tag `%s': `</include>' expected.",yytext);
@@ -548,109 +559,156 @@ const char* *surfxml_statenames=NULL;
  <<EOF>> FAIL("Premature EOF: `</include>' expected.");
 }
 
-<S_surfxml_platform_description_4,E_surfxml_process,S_surfxml_platform_description_5,S_surfxml_process,S_surfxml_route_2,E_surfxml_route,S_surfxml_route_1,S_surfxml_process_1,S_surfxml_platform_description_1,E_surfxml_platform_description,S_surfxml_process_2,S_surfxml_route>"<cpu"{s} FAIL("Starting tag <cpu> is not allowed here.");
-
-<ROOT_surfxml_cpu,S_surfxml_platform_description_2,S_surfxml_platform_description_3,S_surfxml_platform_description>"<cpu"{s} {
-  AX_surfxml_cpu_name = 0;
-  AX_surfxml_cpu_power = 0;
-  AX_surfxml_cpu_availability = 5;
-  AX_surfxml_cpu_availability_file = 0;
-  AX_surfxml_cpu_state = A_surfxml_cpu_state_ON;
-  AX_surfxml_cpu_state_file = 0;
-  AX_surfxml_cpu_interference_send = 9;
-  AX_surfxml_cpu_interference_recv = 13;
-  AX_surfxml_cpu_interference_send_recv = 17;
-  AX_surfxml_cpu_max_outgoing_rate = 21;
-  ENTER(AL_surfxml_cpu); pushbuffer(0);
+<ROOT_surfxml_host,S_surfxml_platform_description_5,S_surfxml_platform_description,S_surfxml_platform_description_4>"<host"{s} {
+  AX_surfxml_host_id = 0;
+  AX_surfxml_host_power = 0;
+  AX_surfxml_host_availability = 5;
+  AX_surfxml_host_availability_file = 0;
+  AX_surfxml_host_state = A_surfxml_host_state_ON;
+  AX_surfxml_host_state_file = 0;
+  AX_surfxml_host_interference_send = 9;
+  AX_surfxml_host_interference_recv = 13;
+  AX_surfxml_host_interference_send_recv = 17;
+  AX_surfxml_host_max_outgoing_rate = 21;
+  ENTER(AL_surfxml_host); pushbuffer(0);
   }
 
-<AL_surfxml_cpu>{
- "name"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_cpu_name);
- "name"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_cpu_name);
+<AL_surfxml_host>{
+ "id"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_host_id);
+ "id"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_host_id);
 
- "power"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_cpu_power);
- "power"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_cpu_power);
+ "power"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_host_power);
+ "power"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_host_power);
 
- "availability"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_cpu_availability);
- "availability"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_cpu_availability);
+ "availability"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_host_availability);
+ "availability"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_host_availability);
 
- "availability_file"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_cpu_availability_file);
- "availability_file"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_cpu_availability_file);
+ "availability_file"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_host_availability_file);
+ "availability_file"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_host_availability_file);
 
  "state"{Eq}"'ON'" |
- "state"{Eq}"\"ON\"" A_surfxml_cpu_state = A_surfxml_cpu_state_ON;
+ "state"{Eq}"\"ON\"" A_surfxml_host_state = A_surfxml_host_state_ON;
  "state"{Eq}"'OFF'" |
- "state"{Eq}"\"OFF\"" A_surfxml_cpu_state = A_surfxml_cpu_state_OFF;
+ "state"{Eq}"\"OFF\"" A_surfxml_host_state = A_surfxml_host_state_OFF;
 
- "state_file"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_cpu_state_file);
- "state_file"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_cpu_state_file);
+ "state_file"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_host_state_file);
+ "state_file"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_host_state_file);
 
- "interference_send"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_cpu_interference_send);
- "interference_send"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_cpu_interference_send);
+ "interference_send"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_host_interference_send);
+ "interference_send"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_host_interference_send);
 
- "interference_recv"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_cpu_interference_recv);
- "interference_recv"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_cpu_interference_recv);
+ "interference_recv"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_host_interference_recv);
+ "interference_recv"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_host_interference_recv);
 
- "interference_send_recv"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_cpu_interference_send_recv);
- "interference_send_recv"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_cpu_interference_send_recv);
+ "interference_send_recv"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_host_interference_send_recv);
+ "interference_send_recv"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_host_interference_send_recv);
 
- "max_outgoing_rate"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_cpu_max_outgoing_rate);
- "max_outgoing_rate"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_cpu_max_outgoing_rate);
+ "max_outgoing_rate"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_host_max_outgoing_rate);
+ "max_outgoing_rate"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_host_max_outgoing_rate);
 
  ">" {
-  if (!AX_surfxml_cpu_name) FAIL("Required attribute `name' not set for `cpu' element.");
-  if (!AX_surfxml_cpu_power) FAIL("Required attribute `power' not set for `cpu' element.");
-  LEAVE; STag_surfxml_cpu();surfxml_pcdata_ix = 0; ENTER(E_surfxml_cpu);
+  if (!AX_surfxml_host_id) FAIL("Required attribute `id' not set for `host' element.");
+  if (!AX_surfxml_host_power) FAIL("Required attribute `power' not set for `host' element.");
+  LEAVE; STag_surfxml_host();surfxml_pcdata_ix = 0; ENTER(S_surfxml_host);
  }
  "/>" {
-  if (!AX_surfxml_cpu_name) FAIL("Required attribute `name' not set for `cpu' element.");
-  if (!AX_surfxml_cpu_power) FAIL("Required attribute `power' not set for `cpu' element.");
-  LEAVE; STag_surfxml_cpu(); surfxml_pcdata_ix = 0; ETag_surfxml_cpu(); popbuffer(); /* attribute */
+  if (!AX_surfxml_host_id) FAIL("Required attribute `id' not set for `host' element.");
+  if (!AX_surfxml_host_power) FAIL("Required attribute `power' not set for `host' element.");
+  LEAVE; STag_surfxml_host(); surfxml_pcdata_ix = 0; ETag_surfxml_host(); popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_2: case S_surfxml_platform_description_3: case S_surfxml_platform_description: SET(S_surfxml_platform_description_3); break;
-   case ROOT_surfxml_cpu: SET(EPILOG); break;
+   case S_surfxml_platform_description_5: case S_surfxml_platform_description: case S_surfxml_platform_description_4: SET(S_surfxml_platform_description_5); break;
+   case ROOT_surfxml_host: SET(EPILOG); break;
   }
  }
- .       FAIL("Unexpected character `%c' in attribute list of cpu element.", yytext[0]);
- {Name} FAIL("Bad attribute `%s' in `cpu' element start tag.",yytext);
- <<EOF>> FAIL("EOF in attribute list of `cpu' element.");
+ .       FAIL("Unexpected character `%c' in attribute list of host element.", yytext[0]);
+ {Name} FAIL("Bad attribute `%s' in `host' element start tag.",yytext);
+ <<EOF>> FAIL("EOF in attribute list of `host' element.");
 }
 
-<E_surfxml_cpu>{
- "</cpu"{s}">" {
+<S_surfxml_host,E_surfxml_host,S_surfxml_host_2>{
+ "</host"{s}">" {
   LEAVE;
-  ETag_surfxml_cpu();
+  ETag_surfxml_host();
   popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_2: case S_surfxml_platform_description_3: case S_surfxml_platform_description: SET(S_surfxml_platform_description_3); break;
-   case ROOT_surfxml_cpu: SET(EPILOG); break;
+   case S_surfxml_platform_description_5: case S_surfxml_platform_description: case S_surfxml_platform_description_4: SET(S_surfxml_platform_description_5); break;
+   case ROOT_surfxml_host: SET(EPILOG); break;
   }
  }
- "</"{Name}{s}">" FAIL("Unexpected end-tag `%s': `</cpu>' expected.",yytext);
- .       FAIL("Unexpected character `%c': `</cpu>' expected.",yytext[0]);
- <<EOF>> FAIL("Premature EOF: `</cpu>' expected.");
+ "</"{Name}{s}">" FAIL("Unexpected end-tag `%s': `</host>' expected.",yytext);
+ .       FAIL("Unexpected character `%c': `</host>' expected.",yytext[0]);
+ <<EOF>> FAIL("Premature EOF: `</host>' expected.");
 }
 
-<S_surfxml_platform_description_4,E_surfxml_process,S_surfxml_platform_description_5,S_surfxml_process,S_surfxml_route_2,E_surfxml_route,S_surfxml_route_1,S_surfxml_process_1,S_surfxml_platform_description_1,E_surfxml_platform_description,S_surfxml_process_2,S_surfxml_route>"<router"{s} FAIL("Starting tag <router> is not allowed here.");
+<ROOT_surfxml_prop,S_surfxml_host,S_surfxml_link_1,S_surfxml_link_2,S_surfxml_host_1,S_surfxml_link,S_surfxml_process_1,S_surfxml_process,S_surfxml_host_2,S_surfxml_process_2>"<prop"{s} {
+  AX_surfxml_prop_id = 0;
+  AX_surfxml_prop_value = 0;
+  ENTER(AL_surfxml_prop); pushbuffer(0);
+  }
+
+<AL_surfxml_prop>{
+ "id"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_prop_id);
+ "id"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_prop_id);
+
+ "value"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_prop_value);
+ "value"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_prop_value);
 
-<ROOT_surfxml_router,S_surfxml_platform_description_2,S_surfxml_platform_description_3,S_surfxml_platform_description>"<router"{s} {
-  AX_surfxml_router_name = 0;
+ ">" {
+  if (!AX_surfxml_prop_id) FAIL("Required attribute `id' not set for `prop' element.");
+  if (!AX_surfxml_prop_value) FAIL("Required attribute `value' not set for `prop' element.");
+  LEAVE; STag_surfxml_prop();surfxml_pcdata_ix = 0; ENTER(E_surfxml_prop);
+ }
+ "/>" {
+  if (!AX_surfxml_prop_id) FAIL("Required attribute `id' not set for `prop' element.");
+  if (!AX_surfxml_prop_value) FAIL("Required attribute `value' not set for `prop' element.");
+  LEAVE; STag_surfxml_prop(); surfxml_pcdata_ix = 0; ETag_surfxml_prop(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_process_1: case S_surfxml_process: case S_surfxml_process_2: SET(S_surfxml_process_2); break;
+   case S_surfxml_host: case S_surfxml_host_1: case S_surfxml_host_2: SET(S_surfxml_host_2); break;
+   case ROOT_surfxml_prop: SET(EPILOG); break;
+   case S_surfxml_link_1: case S_surfxml_link_2: case S_surfxml_link: SET(S_surfxml_link_2); break;
+  }
+ }
+ .       FAIL("Unexpected character `%c' in attribute list of prop element.", yytext[0]);
+ {Name} FAIL("Bad attribute `%s' in `prop' element start tag.",yytext);
+ <<EOF>> FAIL("EOF in attribute list of `prop' element.");
+}
+
+<E_surfxml_prop>{
+ "</prop"{s}">" {
+  LEAVE;
+  ETag_surfxml_prop();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_process_1: case S_surfxml_process: case S_surfxml_process_2: SET(S_surfxml_process_2); break;
+   case S_surfxml_host: case S_surfxml_host_1: case S_surfxml_host_2: SET(S_surfxml_host_2); break;
+   case ROOT_surfxml_prop: SET(EPILOG); break;
+   case S_surfxml_link_1: case S_surfxml_link_2: case S_surfxml_link: SET(S_surfxml_link_2); break;
+  }
+ }
+ "</"{Name}{s}">" FAIL("Unexpected end-tag `%s': `</prop>' expected.",yytext);
+ .       FAIL("Unexpected character `%c': `</prop>' expected.",yytext[0]);
+ <<EOF>> FAIL("Premature EOF: `</prop>' expected.");
+}
+
+<ROOT_surfxml_router,S_surfxml_platform_description_8,S_surfxml_platform_description_5,S_surfxml_platform_description_3,S_surfxml_platform_description,S_surfxml_platform_description_7>"<router"{s} {
+  AX_surfxml_router_id = 0;
   ENTER(AL_surfxml_router); pushbuffer(0);
   }
 
 <AL_surfxml_router>{
- "name"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_router_name);
- "name"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_router_name);
+ "id"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_router_id);
+ "id"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_router_id);
 
  ">" {
-  if (!AX_surfxml_router_name) FAIL("Required attribute `name' not set for `router' element.");
+  if (!AX_surfxml_router_id) FAIL("Required attribute `id' not set for `router' element.");
   LEAVE; STag_surfxml_router();surfxml_pcdata_ix = 0; ENTER(E_surfxml_router);
  }
  "/>" {
-  if (!AX_surfxml_router_name) FAIL("Required attribute `name' not set for `router' element.");
+  if (!AX_surfxml_router_id) FAIL("Required attribute `id' not set for `router' element.");
   LEAVE; STag_surfxml_router(); surfxml_pcdata_ix = 0; ETag_surfxml_router(); popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_2: case S_surfxml_platform_description_3: case S_surfxml_platform_description: SET(S_surfxml_platform_description_3); break;
+   case S_surfxml_platform_description_8: case S_surfxml_platform_description_5: case S_surfxml_platform_description_3: case S_surfxml_platform_description: case S_surfxml_platform_description_7: SET(S_surfxml_platform_description_8); break;
    case ROOT_surfxml_router: SET(EPILOG); break;
   }
  }
@@ -665,7 +723,7 @@ const char* *surfxml_statenames=NULL;
   ETag_surfxml_router();
   popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_2: case S_surfxml_platform_description_3: case S_surfxml_platform_description: SET(S_surfxml_platform_description_3); break;
+   case S_surfxml_platform_description_8: case S_surfxml_platform_description_5: case S_surfxml_platform_description_3: case S_surfxml_platform_description: case S_surfxml_platform_description_7: SET(S_surfxml_platform_description_8); break;
    case ROOT_surfxml_router: SET(EPILOG); break;
   }
  }
@@ -674,86 +732,82 @@ const char* *surfxml_statenames=NULL;
  <<EOF>> FAIL("Premature EOF: `</router>' expected.");
 }
 
-<S_surfxml_platform_description_4,E_surfxml_process,S_surfxml_platform_description_5,S_surfxml_process,S_surfxml_route_2,E_surfxml_route,S_surfxml_route_1,S_surfxml_process_1,S_surfxml_platform_description_1,E_surfxml_platform_description,S_surfxml_process_2,S_surfxml_route>"<network_link"{s} FAIL("Starting tag <network_link> is not allowed here.");
-
-<ROOT_surfxml_network_link,S_surfxml_platform_description_2,S_surfxml_platform_description_3,S_surfxml_platform_description>"<network_link"{s} {
-  AX_surfxml_network_link_name = 0;
-  AX_surfxml_network_link_bandwidth = 0;
-  AX_surfxml_network_link_bandwidth_file = 0;
-  AX_surfxml_network_link_latency = 26;
-  AX_surfxml_network_link_latency_file = 0;
-  AX_surfxml_network_link_state = A_surfxml_network_link_state_ON;
-  AX_surfxml_network_link_state_file = 0;
-  AX_surfxml_network_link_sharing_policy = A_surfxml_network_link_sharing_policy_SHARED;
-  ENTER(AL_surfxml_network_link); pushbuffer(0);
+<ROOT_surfxml_link,S_surfxml_platform_description_8,S_surfxml_platform_description_10,S_surfxml_platform_description_5,S_surfxml_platform_description_11,S_surfxml_platform_description_3,S_surfxml_platform_description,S_surfxml_platform_description_6>"<link"{s} {
+  AX_surfxml_link_id = 0;
+  AX_surfxml_link_bandwidth = 0;
+  AX_surfxml_link_bandwidth_file = 0;
+  AX_surfxml_link_latency = 26;
+  AX_surfxml_link_latency_file = 0;
+  AX_surfxml_link_state = A_surfxml_link_state_ON;
+  AX_surfxml_link_state_file = 0;
+  AX_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+  ENTER(AL_surfxml_link); pushbuffer(0);
   }
 
-<AL_surfxml_network_link>{
- "name"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_network_link_name);
- "name"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_network_link_name);
+<AL_surfxml_link>{
+ "id"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_link_id);
+ "id"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_link_id);
 
- "bandwidth"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_network_link_bandwidth);
- "bandwidth"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_network_link_bandwidth);
+ "bandwidth"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_link_bandwidth);
+ "bandwidth"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_link_bandwidth);
 
- "bandwidth_file"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_network_link_bandwidth_file);
- "bandwidth_file"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_network_link_bandwidth_file);
+ "bandwidth_file"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_link_bandwidth_file);
+ "bandwidth_file"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_link_bandwidth_file);
 
- "latency"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_network_link_latency);
- "latency"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_network_link_latency);
+ "latency"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_link_latency);
+ "latency"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_link_latency);
 
- "latency_file"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_network_link_latency_file);
- "latency_file"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_network_link_latency_file);
+ "latency_file"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_link_latency_file);
+ "latency_file"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_link_latency_file);
 
  "state"{Eq}"'ON'" |
- "state"{Eq}"\"ON\"" A_surfxml_network_link_state = A_surfxml_network_link_state_ON;
+ "state"{Eq}"\"ON\"" A_surfxml_link_state = A_surfxml_link_state_ON;
  "state"{Eq}"'OFF'" |
- "state"{Eq}"\"OFF\"" A_surfxml_network_link_state = A_surfxml_network_link_state_OFF;
+ "state"{Eq}"\"OFF\"" A_surfxml_link_state = A_surfxml_link_state_OFF;
 
- "state_file"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_network_link_state_file);
- "state_file"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_network_link_state_file);
+ "state_file"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_link_state_file);
+ "state_file"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_link_state_file);
 
  "sharing_policy"{Eq}"'SHARED'" |
- "sharing_policy"{Eq}"\"SHARED\"" A_surfxml_network_link_sharing_policy = A_surfxml_network_link_sharing_policy_SHARED;
+ "sharing_policy"{Eq}"\"SHARED\"" A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
  "sharing_policy"{Eq}"'FATPIPE'" |
- "sharing_policy"{Eq}"\"FATPIPE\"" A_surfxml_network_link_sharing_policy = A_surfxml_network_link_sharing_policy_FATPIPE;
+ "sharing_policy"{Eq}"\"FATPIPE\"" A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;
 
  ">" {
-  if (!AX_surfxml_network_link_name) FAIL("Required attribute `name' not set for `network_link' element.");
-  if (!AX_surfxml_network_link_bandwidth) FAIL("Required attribute `bandwidth' not set for `network_link' element.");
-  LEAVE; STag_surfxml_network_link();surfxml_pcdata_ix = 0; ENTER(E_surfxml_network_link);
+  if (!AX_surfxml_link_id) FAIL("Required attribute `id' not set for `link' element.");
+  if (!AX_surfxml_link_bandwidth) FAIL("Required attribute `bandwidth' not set for `link' element.");
+  LEAVE; STag_surfxml_link();surfxml_pcdata_ix = 0; ENTER(S_surfxml_link);
  }
  "/>" {
-  if (!AX_surfxml_network_link_name) FAIL("Required attribute `name' not set for `network_link' element.");
-  if (!AX_surfxml_network_link_bandwidth) FAIL("Required attribute `bandwidth' not set for `network_link' element.");
-  LEAVE; STag_surfxml_network_link(); surfxml_pcdata_ix = 0; ETag_surfxml_network_link(); popbuffer(); /* attribute */
+  if (!AX_surfxml_link_id) FAIL("Required attribute `id' not set for `link' element.");
+  if (!AX_surfxml_link_bandwidth) FAIL("Required attribute `bandwidth' not set for `link' element.");
+  LEAVE; STag_surfxml_link(); surfxml_pcdata_ix = 0; ETag_surfxml_link(); popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_2: case S_surfxml_platform_description_3: case S_surfxml_platform_description: SET(S_surfxml_platform_description_3); break;
-   case ROOT_surfxml_network_link: SET(EPILOG); break;
+   case S_surfxml_platform_description_8: case S_surfxml_platform_description_10: case S_surfxml_platform_description_5: case S_surfxml_platform_description_11: case S_surfxml_platform_description_3: case S_surfxml_platform_description: case S_surfxml_platform_description_6: SET(S_surfxml_platform_description_11); break;
+   case ROOT_surfxml_link: SET(EPILOG); break;
   }
  }
- .       FAIL("Unexpected character `%c' in attribute list of network_link element.", yytext[0]);
- {Name} FAIL("Bad attribute `%s' in `network_link' element start tag.",yytext);
- <<EOF>> FAIL("EOF in attribute list of `network_link' element.");
+ .       FAIL("Unexpected character `%c' in attribute list of link element.", yytext[0]);
+ {Name} FAIL("Bad attribute `%s' in `link' element start tag.",yytext);
+ <<EOF>> FAIL("EOF in attribute list of `link' element.");
 }
 
-<E_surfxml_network_link>{
- "</network_link"{s}">" {
+<E_surfxml_link,S_surfxml_link_2,S_surfxml_link>{
+ "</link"{s}">" {
   LEAVE;
-  ETag_surfxml_network_link();
+  ETag_surfxml_link();
   popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_2: case S_surfxml_platform_description_3: case S_surfxml_platform_description: SET(S_surfxml_platform_description_3); break;
-   case ROOT_surfxml_network_link: SET(EPILOG); break;
+   case S_surfxml_platform_description_8: case S_surfxml_platform_description_10: case S_surfxml_platform_description_5: case S_surfxml_platform_description_11: case S_surfxml_platform_description_3: case S_surfxml_platform_description: case S_surfxml_platform_description_6: SET(S_surfxml_platform_description_11); break;
+   case ROOT_surfxml_link: SET(EPILOG); break;
   }
  }
- "</"{Name}{s}">" FAIL("Unexpected end-tag `%s': `</network_link>' expected.",yytext);
- .       FAIL("Unexpected character `%c': `</network_link>' expected.",yytext[0]);
- <<EOF>> FAIL("Premature EOF: `</network_link>' expected.");
+ "</"{Name}{s}">" FAIL("Unexpected end-tag `%s': `</link>' expected.",yytext);
+ .       FAIL("Unexpected character `%c': `</link>' expected.",yytext[0]);
+ <<EOF>> FAIL("Premature EOF: `</link>' expected.");
 }
 
-<E_surfxml_process,S_surfxml_process,S_surfxml_route_2,E_surfxml_route,S_surfxml_route_1,S_surfxml_process_1,E_surfxml_platform_description,S_surfxml_process_2,S_surfxml_platform_description_2,S_surfxml_route>"<route"{s} FAIL("Starting tag <route> is not allowed here.");
-
-<ROOT_surfxml_route,S_surfxml_platform_description_5,S_surfxml_platform_description_3,S_surfxml_platform_description_1,S_surfxml_platform_description,S_surfxml_platform_description_4>"<route"{s} {
+<ROOT_surfxml_route,S_surfxml_platform_description_8,S_surfxml_platform_description_5,S_surfxml_platform_description_9,S_surfxml_platform_description_11,S_surfxml_platform_description_13,S_surfxml_platform_description_14,S_surfxml_platform_description_3,S_surfxml_platform_description,S_surfxml_platform_description_6>"<route"{s} {
   AX_surfxml_route_src = 0;
   AX_surfxml_route_dst = 0;
   AX_surfxml_route_impact_on_src = 30;
@@ -792,7 +846,7 @@ const char* *surfxml_statenames=NULL;
   if (!AX_surfxml_route_dst) FAIL("Required attribute `dst' not set for `route' element.");
   LEAVE; STag_surfxml_route(); surfxml_pcdata_ix = 0; ETag_surfxml_route(); popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_5: case S_surfxml_platform_description_3: case S_surfxml_platform_description_1: case S_surfxml_platform_description: case S_surfxml_platform_description_4: SET(S_surfxml_platform_description_5); break;
+   case S_surfxml_platform_description_8: case S_surfxml_platform_description_5: case S_surfxml_platform_description_9: case S_surfxml_platform_description_11: case S_surfxml_platform_description_13: case S_surfxml_platform_description_14: case S_surfxml_platform_description_3: case S_surfxml_platform_description: case S_surfxml_platform_description_6: SET(S_surfxml_platform_description_14); break;
    case ROOT_surfxml_route: SET(EPILOG); break;
   }
  }
@@ -807,7 +861,7 @@ const char* *surfxml_statenames=NULL;
   ETag_surfxml_route();
   popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_5: case S_surfxml_platform_description_3: case S_surfxml_platform_description_1: case S_surfxml_platform_description: case S_surfxml_platform_description_4: SET(S_surfxml_platform_description_5); break;
+   case S_surfxml_platform_description_8: case S_surfxml_platform_description_5: case S_surfxml_platform_description_9: case S_surfxml_platform_description_11: case S_surfxml_platform_description_13: case S_surfxml_platform_description_14: case S_surfxml_platform_description_3: case S_surfxml_platform_description: case S_surfxml_platform_description_6: SET(S_surfxml_platform_description_14); break;
    case ROOT_surfxml_route: SET(EPILOG); break;
   }
  }
@@ -816,52 +870,48 @@ const char* *surfxml_statenames=NULL;
  <<EOF>> FAIL("Premature EOF: `</route>' expected.");
 }
 
-<S_surfxml_platform_description_4,E_surfxml_process,S_surfxml_platform_description_5,S_surfxml_process,S_surfxml_platform_description_3,E_surfxml_route,S_surfxml_platform_description,S_surfxml_process_1,S_surfxml_platform_description_1,E_surfxml_platform_description,S_surfxml_process_2,S_surfxml_platform_description_2>"<route_element"{s} FAIL("Starting tag <route_element> is not allowed here.");
-
-<ROOT_surfxml_route_element,S_surfxml_route_1,S_surfxml_route,S_surfxml_route_2>"<route_element"{s} {
-  AX_surfxml_route_element_name = 0;
-  ENTER(AL_surfxml_route_element); pushbuffer(0);
+<ROOT_surfxml_link_c_ctn,S_surfxml_route_1,S_surfxml_route,S_surfxml_route_2>"<link:ctn"{s} {
+  AX_surfxml_link_c_ctn_id = 0;
+  ENTER(AL_surfxml_link_c_ctn); pushbuffer(0);
   }
 
-<AL_surfxml_route_element>{
- "name"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_route_element_name);
- "name"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_route_element_name);
+<AL_surfxml_link_c_ctn>{
+ "id"{Eq}\' ENTER(VALUE1); BUFFERSET(AX_surfxml_link_c_ctn_id);
+ "id"{Eq}\" ENTER(VALUE2); BUFFERSET(AX_surfxml_link_c_ctn_id);
 
  ">" {
-  if (!AX_surfxml_route_element_name) FAIL("Required attribute `name' not set for `route_element' element.");
-  LEAVE; STag_surfxml_route_element();surfxml_pcdata_ix = 0; ENTER(E_surfxml_route_element);
+  if (!AX_surfxml_link_c_ctn_id) FAIL("Required attribute `id' not set for `link:ctn' element.");
+  LEAVE; STag_surfxml_link_c_ctn();surfxml_pcdata_ix = 0; ENTER(E_surfxml_link_c_ctn);
  }
  "/>" {
-  if (!AX_surfxml_route_element_name) FAIL("Required attribute `name' not set for `route_element' element.");
-  LEAVE; STag_surfxml_route_element(); surfxml_pcdata_ix = 0; ETag_surfxml_route_element(); popbuffer(); /* attribute */
+  if (!AX_surfxml_link_c_ctn_id) FAIL("Required attribute `id' not set for `link:ctn' element.");
+  LEAVE; STag_surfxml_link_c_ctn(); surfxml_pcdata_ix = 0; ETag_surfxml_link_c_ctn(); popbuffer(); /* attribute */
   switch (YY_START) {
    case S_surfxml_route_1: case S_surfxml_route: case S_surfxml_route_2: SET(S_surfxml_route_2); break;
-   case ROOT_surfxml_route_element: SET(EPILOG); break;
+   case ROOT_surfxml_link_c_ctn: SET(EPILOG); break;
   }
  }
- .       FAIL("Unexpected character `%c' in attribute list of route_element element.", yytext[0]);
- {Name} FAIL("Bad attribute `%s' in `route_element' element start tag.",yytext);
- <<EOF>> FAIL("EOF in attribute list of `route_element' element.");
+ .       FAIL("Unexpected character `%c' in attribute list of link:ctn element.", yytext[0]);
+ {Name} FAIL("Bad attribute `%s' in `link:ctn' element start tag.",yytext);
+ <<EOF>> FAIL("EOF in attribute list of `link:ctn' element.");
 }
 
-<E_surfxml_route_element>{
- "</route_element"{s}">" {
+<E_surfxml_link_c_ctn>{
+ "</link:ctn"{s}">" {
   LEAVE;
-  ETag_surfxml_route_element();
+  ETag_surfxml_link_c_ctn();
   popbuffer(); /* attribute */
   switch (YY_START) {
    case S_surfxml_route_1: case S_surfxml_route: case S_surfxml_route_2: SET(S_surfxml_route_2); break;
-   case ROOT_surfxml_route_element: SET(EPILOG); break;
+   case ROOT_surfxml_link_c_ctn: SET(EPILOG); break;
   }
  }
- "</"{Name}{s}">" FAIL("Unexpected end-tag `%s': `</route_element>' expected.",yytext);
- .       FAIL("Unexpected character `%c': `</route_element>' expected.",yytext[0]);
- <<EOF>> FAIL("Premature EOF: `</route_element>' expected.");
+ "</"{Name}{s}">" FAIL("Unexpected end-tag `%s': `</link:ctn>' expected.",yytext);
+ .       FAIL("Unexpected character `%c': `</link:ctn>' expected.",yytext[0]);
+ <<EOF>> FAIL("Premature EOF: `</link:ctn>' expected.");
 }
 
-<E_surfxml_process,S_surfxml_process,S_surfxml_route_2,E_surfxml_route,S_surfxml_route_1,S_surfxml_process_1,E_surfxml_platform_description,S_surfxml_process_2,S_surfxml_platform_description_2,S_surfxml_route>"<process"{s} FAIL("Starting tag <process> is not allowed here.");
-
-<ROOT_surfxml_process,S_surfxml_platform_description_5,S_surfxml_platform_description_3,S_surfxml_platform_description_1,S_surfxml_platform_description,S_surfxml_platform_description_4>"<process"{s} {
+<ROOT_surfxml_process,S_surfxml_platform_description_8,S_surfxml_platform_description_16,S_surfxml_platform_description_5,S_surfxml_platform_description_9,S_surfxml_platform_description_11,S_surfxml_platform_description_15,S_surfxml_platform_description_12,S_surfxml_platform_description_14,S_surfxml_platform_description_3,S_surfxml_platform_description,S_surfxml_platform_description_6>"<process"{s} {
   AX_surfxml_process_host = 0;
   AX_surfxml_process_function = 0;
   AX_surfxml_process_start_time = 46;
@@ -892,7 +942,7 @@ const char* *surfxml_statenames=NULL;
   if (!AX_surfxml_process_function) FAIL("Required attribute `function' not set for `process' element.");
   LEAVE; STag_surfxml_process(); surfxml_pcdata_ix = 0; ETag_surfxml_process(); popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_5: case S_surfxml_platform_description_3: case S_surfxml_platform_description_1: case S_surfxml_platform_description: case S_surfxml_platform_description_4: SET(S_surfxml_platform_description_5); break;
+   case S_surfxml_platform_description_8: case S_surfxml_platform_description_16: case S_surfxml_platform_description_5: case S_surfxml_platform_description_9: case S_surfxml_platform_description_11: case S_surfxml_platform_description_15: case S_surfxml_platform_description_12: case S_surfxml_platform_description_14: case S_surfxml_platform_description_3: case S_surfxml_platform_description: case S_surfxml_platform_description_6: SET(S_surfxml_platform_description_16); break;
    case ROOT_surfxml_process: SET(EPILOG); break;
   }
  }
@@ -901,13 +951,13 @@ const char* *surfxml_statenames=NULL;
  <<EOF>> FAIL("EOF in attribute list of `process' element.");
 }
 
-<S_surfxml_process,E_surfxml_process,S_surfxml_process_2>{
+<E_surfxml_process,S_surfxml_process,S_surfxml_process_2>{
  "</process"{s}">" {
   LEAVE;
   ETag_surfxml_process();
   popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_surfxml_platform_description_5: case S_surfxml_platform_description_3: case S_surfxml_platform_description_1: case S_surfxml_platform_description: case S_surfxml_platform_description_4: SET(S_surfxml_platform_description_5); break;
+   case S_surfxml_platform_description_8: case S_surfxml_platform_description_16: case S_surfxml_platform_description_5: case S_surfxml_platform_description_9: case S_surfxml_platform_description_11: case S_surfxml_platform_description_15: case S_surfxml_platform_description_12: case S_surfxml_platform_description_14: case S_surfxml_platform_description_3: case S_surfxml_platform_description: case S_surfxml_platform_description_6: SET(S_surfxml_platform_description_16); break;
    case ROOT_surfxml_process: SET(EPILOG); break;
   }
  }
@@ -916,8 +966,6 @@ const char* *surfxml_statenames=NULL;
  <<EOF>> FAIL("Premature EOF: `</process>' expected.");
 }
 
-<S_surfxml_platform_description_4,E_surfxml_process,S_surfxml_platform_description_5,S_surfxml_platform_description_3,S_surfxml_route_2,E_surfxml_route,S_surfxml_platform_description,S_surfxml_route_1,S_surfxml_platform_description_1,E_surfxml_platform_description,S_surfxml_platform_description_2,S_surfxml_route>"<argument"{s} FAIL("Starting tag <argument> is not allowed here.");
-
 <ROOT_surfxml_argument,S_surfxml_process_1,S_surfxml_process,S_surfxml_process_2>"<argument"{s} {
   AX_surfxml_argument_value = 0;
   ENTER(AL_surfxml_argument); pushbuffer(0);
diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 863a15b68a..7956cd942d 100644
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -7,6 +7,7 @@
 
 #include "xbt/misc.h"
 #include "xbt/log.h"
+#include "xbt/dict.h"
 #include "surf/surfxml_parse_private.h"
 #include "surf/surf_private.h"
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(parse, surf,
@@ -18,50 +19,39 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(parse, surf,
 static xbt_dynar_t surf_input_buffer_stack = NULL;
 static xbt_dynar_t surf_file_to_parse_stack = NULL;
 
+void surfxml_call_cb_functions(xbt_dynar_t);
+
 void nil_function(void);
 void nil_function(void)
 {
   return;
 }
 
-void_f_void_t STag_surfxml_platform_description_fun = nil_function;
-void_f_void_t ETag_surfxml_platform_description_fun = nil_function;
-void_f_void_t STag_surfxml_cpu_fun = nil_function;
-void_f_void_t ETag_surfxml_cpu_fun = nil_function;
-void_f_void_t STag_surfxml_router_fun = nil_function;
-void_f_void_t ETag_surfxml_router_fun = nil_function;
-void_f_void_t STag_surfxml_network_link_fun = nil_function;
-void_f_void_t ETag_surfxml_network_link_fun = nil_function;
-void_f_void_t STag_surfxml_route_fun = nil_function;
-void_f_void_t ETag_surfxml_route_fun = nil_function;
-void_f_void_t STag_surfxml_route_element_fun = nil_function;
-void_f_void_t ETag_surfxml_route_element_fun = nil_function;
-void_f_void_t STag_surfxml_process_fun = nil_function;
-void_f_void_t ETag_surfxml_process_fun = nil_function;
-void_f_void_t STag_surfxml_argument_fun = nil_function;
-void_f_void_t ETag_surfxml_argument_fun = nil_function;
-
 YY_BUFFER_STATE surf_input_buffer;
 FILE *surf_file_to_parse;
 
 void surf_parse_reset_parser(void)
 {
-  STag_surfxml_platform_description_fun = nil_function;
-  ETag_surfxml_platform_description_fun = nil_function;
-  STag_surfxml_cpu_fun = nil_function;
-  ETag_surfxml_cpu_fun = nil_function;
-  STag_surfxml_router_fun = nil_function;
-  ETag_surfxml_router_fun = nil_function;
-  STag_surfxml_network_link_fun = nil_function;
-  ETag_surfxml_network_link_fun = nil_function;
-  STag_surfxml_route_fun = nil_function;
-  ETag_surfxml_route_fun = nil_function;
-  STag_surfxml_route_element_fun = nil_function;
-  ETag_surfxml_route_element_fun = nil_function;
-  STag_surfxml_process_fun = nil_function;
-  ETag_surfxml_process_fun = nil_function;
-  STag_surfxml_argument_fun = nil_function;
-  ETag_surfxml_argument_fun = nil_function;
+
+  STag_surfxml_platform_description_cb_list = xbt_dynar_new(sizeof(void_f_void_t),&free);
+  ETag_surfxml_platform_description_cb_list = xbt_dynar_new(sizeof(void_f_void_t),&free);
+  STag_surfxml_host_cb_list = xbt_dynar_new(sizeof(void_f_void_t),&free);
+  ETag_surfxml_host_cb_list = xbt_dynar_new(sizeof(void_f_void_t),&free);
+  STag_surfxml_router_cb_list = xbt_dynar_new(sizeof(void_f_void_t),&free);
+  ETag_surfxml_router_cb_list = xbt_dynar_new(sizeof(void_f_void_t),&free);
+  STag_surfxml_link_cb_list = xbt_dynar_new(sizeof(void_f_void_t),&free);
+  ETag_surfxml_link_cb_list = xbt_dynar_new(sizeof(void_f_void_t),&free);
+  STag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t),&free);
+  ETag_surfxml_route_cb_list = xbt_dynar_new(sizeof(void_f_void_t),&free);
+  STag_surfxml_link_c_ctn_cb_list = xbt_dynar_new(sizeof(void_f_void_t),&free);
+  ETag_surfxml_link_c_ctn_cb_list = xbt_dynar_new(sizeof(void_f_void_t),&free);
+  STag_surfxml_process_cb_list = xbt_dynar_new(sizeof(void_f_void_t),&free);
+  ETag_surfxml_process_cb_list = xbt_dynar_new(sizeof(void_f_void_t),&free);
+  STag_surfxml_argument_cb_list = xbt_dynar_new(sizeof(void_f_void_t),&free);
+  ETag_surfxml_argument_cb_list = xbt_dynar_new(sizeof(void_f_void_t),&free);
+  STag_surfxml_prop_cb_list = xbt_dynar_new(sizeof(void_f_void_t),&free);
+  ETag_surfxml_prop_cb_list = xbt_dynar_new(sizeof(void_f_void_t),&free);
+
 }
 
 void STag_surfxml_include(void)
@@ -106,84 +96,94 @@ void STag_surfxml_platform_description(void)
 	      "Last, do not forget to also update your values for "
 	      "the calls to MSG_task_create (if any).");
 
-  (*STag_surfxml_platform_description_fun)();
+  surfxml_call_cb_functions(STag_surfxml_platform_description_cb_list);
 }
 
 void ETag_surfxml_platform_description(void)
 {
-  (*ETag_surfxml_platform_description_fun)();
+  surfxml_call_cb_functions(ETag_surfxml_platform_description_cb_list);
 }
 
-void STag_surfxml_cpu(void)
+void STag_surfxml_host(void)
 {
-  (*STag_surfxml_cpu_fun)();
+  surfxml_call_cb_functions(STag_surfxml_host_cb_list);
 }
 
-void ETag_surfxml_cpu(void)
+void ETag_surfxml_host(void)
 {
-  (*ETag_surfxml_cpu_fun)();
+  surfxml_call_cb_functions(ETag_surfxml_host_cb_list);
 }
 
 void STag_surfxml_router(void)
 {
-  (*STag_surfxml_router_fun)();
+  surfxml_call_cb_functions(STag_surfxml_router_cb_list);
 }
 
 void ETag_surfxml_router(void)
 {
-  (*ETag_surfxml_router_fun)();
+  surfxml_call_cb_functions(ETag_surfxml_router_cb_list);
 }
 
-void STag_surfxml_network_link(void)
+void STag_surfxml_link(void)
 {
-  (*STag_surfxml_network_link_fun)();
+  surfxml_call_cb_functions(STag_surfxml_link_cb_list);
 }
 
-void ETag_surfxml_network_link(void)
+void ETag_surfxml_link(void)
 {
-  (*ETag_surfxml_network_link_fun)();
+  surfxml_call_cb_functions(ETag_surfxml_link_cb_list);
 }
 
 void STag_surfxml_route(void)
 {
-  (*STag_surfxml_route_fun)();
+  surfxml_call_cb_functions(STag_surfxml_route_cb_list);
 }
 
 void ETag_surfxml_route(void)
 {
-  (*ETag_surfxml_route_fun)();
+  surfxml_call_cb_functions(ETag_surfxml_route_cb_list);
 }
 
-void STag_surfxml_route_element(void)
+void STag_surfxml_link_c_ctn(void)
 {
-  (*STag_surfxml_route_element_fun)();
+  surfxml_call_cb_functions(STag_surfxml_link_c_ctn_cb_list);
 }
 
-void ETag_surfxml_route_element(void)
+void ETag_surfxml_link_c_ctn(void)
 {
-  (*ETag_surfxml_route_element_fun)();
+  surfxml_call_cb_functions(ETag_surfxml_link_c_ctn_cb_list);
 }
 
 void STag_surfxml_process(void)
 {
-  (*STag_surfxml_process_fun)();
+  surfxml_call_cb_functions(STag_surfxml_process_cb_list);
 }
 
 void ETag_surfxml_process(void)
 {
-  (*ETag_surfxml_process_fun)();
+  surfxml_call_cb_functions(ETag_surfxml_process_cb_list);
 }
 
 void STag_surfxml_argument(void)
 {
-  (*STag_surfxml_argument_fun)();
+  surfxml_call_cb_functions(STag_surfxml_argument_cb_list);
 }
 
 void ETag_surfxml_argument(void)
 {
-  (*ETag_surfxml_argument_fun)();
+  surfxml_call_cb_functions(ETag_surfxml_argument_cb_list);
 }
 
+void STag_surfxml_prop(void)
+{
+  surfxml_call_cb_functions(STag_surfxml_prop_cb_list);
+}
+void ETag_surfxml_prop(void)
+{
+  surfxml_call_cb_functions(ETag_surfxml_prop_cb_list);
+}
+
+
 void surf_parse_open(const char *file)
 {
   static int warned = 0;	/* warn only once */
@@ -244,3 +244,33 @@ void surf_parse_get_trace(tmgr_trace_t * trace, const char *string)
   else
     *trace = tmgr_trace_new(string);
 }
+
+void parse_properties(void)
+{
+  char *value = NULL;
+
+  if(!current_property_set) current_property_set = xbt_dict_new();
+
+   value = xbt_strdup(A_surfxml_prop_value);  
+   xbt_dict_set(current_property_set, A_surfxml_prop_id, value, free);
+
+}
+
+void free_string(void *d)
+{
+  free(*(void**)d);
+}
+
+void surfxml_add_callback(xbt_dynar_t cb_list, void_f_void_t function)
+{
+  xbt_dynar_push(cb_list, &function);
+}
+
+void surfxml_call_cb_functions(xbt_dynar_t cb_list)
+{
+  int iterator;
+  void_f_void_t data;
+  xbt_dynar_foreach(cb_list, iterator, data){
+       (*data)();
+    }
+}
diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index f2704ddbe0..f4cac36296 100644
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -251,6 +251,12 @@ static double get_available_speed(void *workstation)
       get_available_speed(((workstation_CLM03_t) workstation)->cpu);
 }
 
+static xbt_dict_t get_properties(void *workstation)
+{
+  return surf_cpu_model->common_public->
+      get_cpu_properties(((workstation_CLM03_t) workstation)->cpu);
+}
+
 static surf_action_t execute_parallel_task(int workstation_nb,
 					   void **workstation_list,
 					   double *computation_amount,
@@ -383,6 +389,10 @@ static void surf_workstation_model_init_internal(void)
   surf_workstation_model->extension_public->get_speed = get_speed;
   surf_workstation_model->extension_public->get_available_speed =
       get_available_speed;
+
+  /*manage the properties of the workstation*/
+  surf_workstation_model->common_public->get_cpu_properties = get_properties;
+
   surf_workstation_model->extension_public->communicate = communicate;
   surf_workstation_model->extension_public->execute_parallel_task =
       execute_parallel_task;
diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c
index 06f208bef8..b1a5ff5938 100644
--- a/src/surf/workstation_KCCFLN05.c
+++ b/src/surf/workstation_KCCFLN05.c
@@ -47,6 +47,8 @@ typedef struct cpu_KCCFLN05 {
   int id;			/* cpu and network card are a single object... */
   xbt_dynar_t incomming_communications;
   xbt_dynar_t outgoing_communications;
+  /*Handles the properties that can be added to cpu's*/
+  xbt_dict_t properties;
 } s_cpu_KCCFLN05_t, *cpu_KCCFLN05_t;
 
 /**************************************/
@@ -64,6 +66,8 @@ typedef struct network_link_KCCFLN05 {
   tmgr_trace_event_t bw_event;
   e_surf_network_link_state_t state_current;
   tmgr_trace_event_t state_event;
+  /*holds the properties that can be attached to the link*/
+  xbt_dict_t properties;
 } s_network_link_KCCFLN05_t, *network_link_KCCFLN05_t;
 
 
@@ -631,6 +635,10 @@ static double get_available_speed(void *cpu)
   return ((cpu_KCCFLN05_t) cpu)->power_current;
 }
 
+static xbt_dict_t get_property_list(void *cpu)
+{
+  return ((cpu_KCCFLN05_t) cpu)->properties;
+}
 
 static surf_action_t communicate(void *src, void *dst, double size,
 				 double rate)
@@ -852,6 +860,12 @@ static double get_link_latency(const void *link)
   return ((network_link_KCCFLN05_t) link)->lat_current;
 }
 
+static xbt_dict_t get_link_property_list(void *link)
+{
+ return ((network_link_KCCFLN05_t) link)->properties;
+}
+
+
 /**************************************/
 /*** Resource Creation & Destruction **/
 /**************************************/
@@ -879,7 +893,7 @@ static void router_new(const char *name)
 static void parse_routers(void)
 {
   //add a dumb router just to be GTNETS compatible
-  router_new(A_surfxml_router_name);
+  router_new(A_surfxml_router_id);
 }
 
 static void cpu_free(void *cpu)
@@ -898,7 +912,8 @@ static cpu_KCCFLN05_t cpu_new(const char *name, double power_scale,
 			      double interference_send,
 			      double interference_recv,
 			      double interference_send_recv,
-			      double max_outgoing_rate)
+			      double max_outgoing_rate,
+			      xbt_dict_t cpu_properties_k)
 {
   cpu_KCCFLN05_t cpu = xbt_new0(s_cpu_KCCFLN05_t, 1);
 
@@ -935,12 +950,20 @@ static cpu_KCCFLN05_t cpu_new(const char *name, double power_scale,
   cpu->outgoing_communications =
       xbt_dynar_new(sizeof(surf_action_workstation_KCCFLN05_t), NULL);
 
+  /*add the property set*/
+  cpu->properties = current_property_set;
+ 
   xbt_dict_set(workstation_set, name, cpu, cpu_free);
 
   return cpu;
 }
 
-static void parse_cpu(void)
+static void create_routing_table(void)
+{
+    routing_table = xbt_new0(s_route_KCCFLN05_t, nb_workstation * nb_workstation);
+}
+
+static void parse_cpu_init(void)
 {
   double power_scale = 0.0;
   double power_initial = 0.0;
@@ -952,37 +975,31 @@ static void parse_cpu(void)
   double interference_send_recv = 0.0;
   double max_outgoing_rate = -1.0;
 
-  surf_parse_get_double(&power_scale, A_surfxml_cpu_power);
-  surf_parse_get_double(&power_initial, A_surfxml_cpu_availability);
-  surf_parse_get_trace(&power_trace, A_surfxml_cpu_availability_file);
+  surf_parse_get_double(&power_scale, A_surfxml_host_power);
+  surf_parse_get_double(&power_initial, A_surfxml_host_availability);
+  surf_parse_get_trace(&power_trace, A_surfxml_host_availability_file);
 
-  xbt_assert0((A_surfxml_cpu_state == A_surfxml_cpu_state_ON) ||
-	      (A_surfxml_cpu_state == A_surfxml_cpu_state_OFF),
+  xbt_assert0((A_surfxml_host_state == A_surfxml_host_state_ON) ||
+	      (A_surfxml_host_state == A_surfxml_host_state_OFF),
 	      "Invalid state");
-  if (A_surfxml_cpu_state == A_surfxml_cpu_state_ON)
+  if (A_surfxml_host_state == A_surfxml_host_state_ON)
     state_initial = SURF_CPU_ON;
-  if (A_surfxml_cpu_state == A_surfxml_cpu_state_OFF)
+  if (A_surfxml_host_state == A_surfxml_host_state_OFF)
     state_initial = SURF_CPU_OFF;
-  surf_parse_get_trace(&state_trace, A_surfxml_cpu_state_file);
+  surf_parse_get_trace(&state_trace, A_surfxml_host_state_file);
 
   surf_parse_get_double(&interference_send,
-			A_surfxml_cpu_interference_send);
+			A_surfxml_host_interference_send);
   surf_parse_get_double(&interference_recv,
-			A_surfxml_cpu_interference_recv);
+			A_surfxml_host_interference_recv);
   surf_parse_get_double(&interference_send_recv,
-			A_surfxml_cpu_interference_send_recv);
+			A_surfxml_host_interference_send_recv);
   surf_parse_get_double(&max_outgoing_rate,
-			A_surfxml_cpu_max_outgoing_rate);
-
-  cpu_new(A_surfxml_cpu_name, power_scale, power_initial, power_trace,
+			A_surfxml_host_max_outgoing_rate);
+  current_property_set = xbt_dict_new();
+  cpu_new(A_surfxml_host_id, power_scale, power_initial, power_trace,
 	  state_initial, state_trace, interference_send, interference_recv,
-	  interference_send_recv, max_outgoing_rate);
-}
-
-static void create_routing_table(void)
-{
-  routing_table =
-      xbt_new0(s_route_KCCFLN05_t, nb_workstation * nb_workstation);
+	  interference_send_recv, max_outgoing_rate,/*add the properties*/current_property_set);
 }
 
 static void network_link_free(void *nw_link)
@@ -1000,7 +1017,7 @@ static network_link_KCCFLN05_t network_link_new(char *name,
 						state_initial,
 						tmgr_trace_t state_trace,
 						e_surf_network_link_sharing_policy_t
-						policy)
+						policy, xbt_dict_t network_properties_k)
 {
   network_link_KCCFLN05_t nw_link = xbt_new0(s_network_link_KCCFLN05_t, 1);
 
@@ -1027,51 +1044,54 @@ static network_link_KCCFLN05_t network_link_new(char *name,
   if (policy == SURF_NETWORK_LINK_FATPIPE)
     lmm_constraint_shared(nw_link->constraint);
 
+  /*add the property set*/
+  nw_link->properties = network_properties_k;
+
   xbt_dict_set(network_link_set, name, nw_link, network_link_free);
 
   return nw_link;
 }
 
-static void parse_network_link(void)
+static void parse_network_link_init(void)
 {
-  char *name;
+  char *name_link;
   double bw_initial;
   tmgr_trace_t bw_trace;
   double lat_initial;
   tmgr_trace_t lat_trace;
-  e_surf_network_link_state_t state_initial = SURF_NETWORK_LINK_ON;
-  e_surf_network_link_sharing_policy_t policy_initial =
-      SURF_NETWORK_LINK_SHARED;
+  e_surf_network_link_state_t state_initial_link = SURF_NETWORK_LINK_ON;
+  e_surf_network_link_sharing_policy_t policy_initial_link = SURF_NETWORK_LINK_SHARED;
   tmgr_trace_t state_trace;
 
-  name = xbt_strdup(A_surfxml_network_link_name);
-  surf_parse_get_double(&bw_initial, A_surfxml_network_link_bandwidth);
-  surf_parse_get_trace(&bw_trace, A_surfxml_network_link_bandwidth_file);
-  surf_parse_get_double(&lat_initial, A_surfxml_network_link_latency);
-  surf_parse_get_trace(&lat_trace, A_surfxml_network_link_latency_file);
-
-  xbt_assert0((A_surfxml_network_link_state ==
-	       A_surfxml_network_link_state_ON)
-	      || (A_surfxml_network_link_state ==
-		  A_surfxml_network_link_state_OFF), "Invalid state");
-  if (A_surfxml_network_link_state == A_surfxml_network_link_state_ON)
-    state_initial = SURF_NETWORK_LINK_ON;
-  else if (A_surfxml_network_link_state ==
-	   A_surfxml_network_link_state_OFF)
-    state_initial = SURF_NETWORK_LINK_OFF;
-
-  if (A_surfxml_network_link_sharing_policy ==
-      A_surfxml_network_link_sharing_policy_SHARED)
-    policy_initial = SURF_NETWORK_LINK_SHARED;
-  else if (A_surfxml_network_link_sharing_policy ==
-	   A_surfxml_network_link_sharing_policy_FATPIPE)
-    policy_initial = SURF_NETWORK_LINK_FATPIPE;
-
-  surf_parse_get_trace(&state_trace, A_surfxml_network_link_state_file);
-
-  network_link_new(name, bw_initial, bw_trace,
-		   lat_initial, lat_trace, state_initial, state_trace,
-		   policy_initial);
+  name_link = xbt_strdup(A_surfxml_link_id);
+  surf_parse_get_double(&bw_initial, A_surfxml_link_bandwidth);
+  surf_parse_get_trace(&bw_trace, A_surfxml_link_bandwidth_file);
+  surf_parse_get_double(&lat_initial, A_surfxml_link_latency);
+  surf_parse_get_trace(&lat_trace, A_surfxml_link_latency_file);
+
+  xbt_assert0((A_surfxml_link_state ==
+	       A_surfxml_link_state_ON)
+	      || (A_surfxml_link_state ==
+		  A_surfxml_link_state_OFF), "Invalid state");
+  if (A_surfxml_link_state == A_surfxml_link_state_ON)
+    state_initial_link = SURF_NETWORK_LINK_ON;
+  else if (A_surfxml_link_state ==
+	   A_surfxml_link_state_OFF)
+    state_initial_link = SURF_NETWORK_LINK_OFF;
+
+  if (A_surfxml_link_sharing_policy ==
+      A_surfxml_link_sharing_policy_SHARED)
+    policy_initial_link = SURF_NETWORK_LINK_SHARED;
+  else if (A_surfxml_link_sharing_policy ==
+	   A_surfxml_link_sharing_policy_FATPIPE)
+    policy_initial_link = SURF_NETWORK_LINK_FATPIPE;
+
+  surf_parse_get_trace(&state_trace, A_surfxml_link_state_file);
+
+ current_property_set = xbt_dict_new();
+ network_link_new(name_link, bw_initial, bw_trace,
+		   lat_initial, lat_trace, state_initial_link, state_trace,
+		   policy_initial_link,/*add properties*/current_property_set);
 }
 
 static void route_new(int src_id, int dst_id,
@@ -1083,12 +1103,12 @@ static void route_new(int src_id, int dst_id,
   route_KCCFLN05_t route = &(ROUTE(src_id, dst_id));
 
   route->size = nb_link;
-  route->links = link_list =
-      xbt_realloc(link_list, sizeof(network_link_KCCFLN05_t) * nb_link);
+  route->links = link_list = xbt_realloc(link_list, sizeof(network_link_KCCFLN05_t) * nb_link);
   route->impact_on_src = impact_on_src;
-  route->impact_on_dst = impact_on_src;
+  route->impact_on_dst = impact_on_dst;
   route->impact_on_src_with_other_recv = impact_on_src_with_other_recv;
   route->impact_on_dst_with_other_send = impact_on_dst_with_other_send;
+
 }
 
 static int nb_link;
@@ -1100,11 +1120,15 @@ static double impact_on_src;
 static double impact_on_dst;
 static double impact_on_src_with_other_recv;
 static double impact_on_dst_with_other_send;
+static int is_first = 0;
 
 static void parse_route_set_endpoints(void)
 {
   cpu_KCCFLN05_t cpu_tmp = NULL;
 
+  if (!is_first) create_routing_table();
+  is_first = 1;	
+
   cpu_tmp = (cpu_KCCFLN05_t) name_service(A_surfxml_route_src);
   if (cpu_tmp != NULL) {
     src_id = cpu_tmp->id;
@@ -1152,11 +1176,11 @@ static void parse_route_elem(void)
   }
   TRY {
     link_list[nb_link++] =
-	xbt_dict_get(network_link_set, A_surfxml_route_element_name);
+	xbt_dict_get(network_link_set, A_surfxml_link_c_ctn_id);
   }
   CATCH(e) {
     RETHROW1("Link %s not found (dict raised this exception: %s)",
-	     A_surfxml_route_element_name);
+	     A_surfxml_link_c_ctn_id);
   }
 }
 
@@ -1166,44 +1190,29 @@ static void parse_route_set_route(void)
     route_new(src_id, dst_id, link_list, nb_link, impact_on_src,
 	      impact_on_dst, impact_on_src_with_other_recv,
 	      impact_on_dst_with_other_send);
+
 }
 
+
 static void parse_file(const char *file)
 {
   int i;
 
-  /* Figuring out the cpus */
+  /* Adding callback functions */
   surf_parse_reset_parser();
-  ETag_surfxml_cpu_fun = parse_cpu;
+  surfxml_add_callback(STag_surfxml_host_cb_list, &parse_cpu_init);
+  surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
+  surfxml_add_callback(STag_surfxml_router_cb_list, &parse_routers);
+  surfxml_add_callback(STag_surfxml_link_cb_list, &parse_network_link_init);
+  surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
+  surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem);
+  surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
+
+  /* Parse the file */
   surf_parse_open(file);
   xbt_assert1((!surf_parse()), "Parse error in %s", file);
   surf_parse_close();
-
-  create_routing_table();
-
-  /* Figuring out the router (added after GTNETS) */
-  surf_parse_reset_parser();
-  STag_surfxml_router_fun = parse_routers;
-  surf_parse_open(file);
-  xbt_assert1((!surf_parse()), "Parse error in %s", file);
-  surf_parse_close();
-
-  /* Figuring out the network links */
-  surf_parse_reset_parser();
-  ETag_surfxml_network_link_fun = parse_network_link;
-  surf_parse_open(file);
-  xbt_assert1((!surf_parse()), "Parse error in %s", file);
-  surf_parse_close();
-
-  /* Building the routes */
-  surf_parse_reset_parser();
-  STag_surfxml_route_fun = parse_route_set_endpoints;
-  ETag_surfxml_route_element_fun = parse_route_elem;
-  ETag_surfxml_route_fun = parse_route_set_route;
-  surf_parse_open(file);
-  xbt_assert1((!surf_parse()), "Parse error in %s", file);
-  surf_parse_close();
-
+  
   /* Adding loopback if needed */
   for (i = 0; i < nb_workstation; i++)
     if (!ROUTE(i, i).size) {
@@ -1211,7 +1220,7 @@ static void parse_file(const char *file)
 	loopback = network_link_new(xbt_strdup("__MSG_loopback__"),
 				    498000000, NULL, 0.000015, NULL,
 				    SURF_NETWORK_LINK_ON, NULL,
-				    SURF_NETWORK_LINK_FATPIPE);
+				    SURF_NETWORK_LINK_FATPIPE, NULL);
       ROUTE(i, i).size = 1;
       ROUTE(i, i).links = xbt_new0(network_link_KCCFLN05_t, 1);
       ROUTE(i, i).links[0] = loopback;
@@ -1289,6 +1298,10 @@ static void model_init_internal(void)
   surf_workstation_model->extension_public->get_speed = get_speed;
   surf_workstation_model->extension_public->get_available_speed =
       get_available_speed;
+
+  surf_workstation_model->common_public->get_cpu_properties = get_property_list;
+  surf_workstation_model->common_public->get_link_properties = get_link_property_list;
+
   surf_workstation_model->extension_public->communicate = communicate;
   surf_workstation_model->extension_public->execute_parallel_task =
       execute_parallel_task;
diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c
index 6d50b351bc..8e4711a70a 100644
--- a/src/surf/workstation_ptask_L07.c
+++ b/src/surf/workstation_ptask_L07.c
@@ -29,6 +29,7 @@ typedef struct cpu_L07 {
   e_surf_cpu_state_t state_current;
   tmgr_trace_event_t state_event;
   int id;			/* cpu and network card are a single object... */
+  xbt_dict_t properties;
 } s_cpu_L07_t, *cpu_L07_t;
 
 /**************************************/
@@ -46,6 +47,8 @@ typedef struct network_link_L07 {
   tmgr_trace_event_t bw_event;
   e_surf_network_link_state_t state_current;
   tmgr_trace_event_t state_event;
+  /*holds the property list that can be associated with the link*/
+  xbt_dict_t properties;
 } s_network_link_L07_t, *network_link_L07_t;
 
 
@@ -129,6 +132,7 @@ static const char *get_resource_name(void *resource_id)
   /* We can freely cast as a cpu_L07_t because it has the same
      prefix as network_link_L07_t. However, only cpu_L07_t
      will theoretically be given as an argument here. */
+
   return ((cpu_L07_t) resource_id)->name;
 }
 
@@ -466,6 +470,12 @@ static double get_available_speed(void *cpu)
   return ((cpu_L07_t) cpu)->power_current;
 }
 
+static xbt_dict_t get_properties(void *cpu)
+{
+ return ((cpu_L07_t) cpu)->properties;
+}
+
+
 static surf_action_t execute_parallel_task(int workstation_nb,
 					   void **workstation_list,
 					   double *computation_amount,
@@ -658,6 +668,13 @@ static double get_link_latency(const void *link)
   return ((network_link_L07_t) link)->lat_current;
 }
 
+
+static xbt_dict_t get_link_properties(void *link)
+{
+ return ((network_link_L07_t) link)->properties;
+}
+
+
 /**************************************/
 /*** Resource Creation & Destruction **/
 /**************************************/
@@ -672,7 +689,8 @@ static cpu_L07_t cpu_new(const char *name, double power_scale,
 			 double power_initial,
 			 tmgr_trace_t power_trace,
 			 e_surf_cpu_state_t state_initial,
-			 tmgr_trace_t state_trace)
+			 tmgr_trace_t state_trace,
+                         xbt_dict_t cpu_properties)
 {
   cpu_L07_t cpu = xbt_new0(s_cpu_L07_t, 1);
 
@@ -698,12 +716,19 @@ static cpu_L07_t cpu_new(const char *name, double power_scale,
       lmm_constraint_new(ptask_maxmin_system, cpu,
 			 cpu->power_current * cpu->power_scale);
 
-  xbt_dict_set(workstation_set, name, cpu, cpu_free);
+  /*add the property set*/
+  cpu->properties =  current_property_set;
 
+  xbt_dict_set(workstation_set, name, cpu, cpu_free);
   return cpu;
 }
 
-static void parse_cpu(void)
+static void create_routing_table(void)
+{
+   routing_table = xbt_new0(s_route_L07_t, nb_workstation * nb_workstation);
+}
+
+static void parse_cpu_init(void)
 {
   double power_scale = 0.0;
   double power_initial = 0.0;
@@ -711,26 +736,22 @@ static void parse_cpu(void)
   e_surf_cpu_state_t state_initial = SURF_CPU_OFF;
   tmgr_trace_t state_trace = NULL;
 
-  surf_parse_get_double(&power_scale, A_surfxml_cpu_power);
-  surf_parse_get_double(&power_initial, A_surfxml_cpu_availability);
-  surf_parse_get_trace(&power_trace, A_surfxml_cpu_availability_file);
+  surf_parse_get_double(&power_scale, A_surfxml_host_power);
+  surf_parse_get_double(&power_initial, A_surfxml_host_availability);
+  surf_parse_get_trace(&power_trace, A_surfxml_host_availability_file);
 
-  xbt_assert0((A_surfxml_cpu_state == A_surfxml_cpu_state_ON) ||
-	      (A_surfxml_cpu_state == A_surfxml_cpu_state_OFF),
+  xbt_assert0((A_surfxml_host_state == A_surfxml_host_state_ON) ||
+	      (A_surfxml_host_state == A_surfxml_host_state_OFF),
 	      "Invalid state");
-  if (A_surfxml_cpu_state == A_surfxml_cpu_state_ON)
+  if (A_surfxml_host_state == A_surfxml_host_state_ON)
     state_initial = SURF_CPU_ON;
-  if (A_surfxml_cpu_state == A_surfxml_cpu_state_OFF)
+  if (A_surfxml_host_state == A_surfxml_host_state_OFF)
     state_initial = SURF_CPU_OFF;
-  surf_parse_get_trace(&state_trace, A_surfxml_cpu_state_file);
+  surf_parse_get_trace(&state_trace, A_surfxml_host_state_file);
 
-  cpu_new(A_surfxml_cpu_name, power_scale, power_initial, power_trace,
-	  state_initial, state_trace);
-}
-
-static void create_routing_table(void)
-{
-  routing_table = xbt_new0(s_route_L07_t, nb_workstation * nb_workstation);
+  current_property_set = xbt_dict_new();
+  cpu_new(A_surfxml_host_id, power_scale, power_initial, power_trace,
+	  state_initial, state_trace,/*add the properties*/current_property_set);
 }
 
 static void network_link_free(void *nw_link)
@@ -748,7 +769,7 @@ static network_link_L07_t network_link_new(char *name,
 					   state_initial,
 					   tmgr_trace_t state_trace,
 					   e_surf_network_link_sharing_policy_t
-					   policy)
+					   policy, xbt_dict_t properties)
 {
   network_link_L07_t nw_link = xbt_new0(s_network_link_L07_t, 1);
 
@@ -776,51 +797,54 @@ static network_link_L07_t network_link_new(char *name,
   if (policy == SURF_NETWORK_LINK_FATPIPE)
     lmm_constraint_shared(nw_link->constraint);
 
+  nw_link->properties = properties;
+  
   xbt_dict_set(network_link_set, name, nw_link, network_link_free);
 
   return nw_link;
 }
 
-static void parse_network_link(void)
+static void parse_network_link_init(void)
 {
-  char *name;
+  char *name_link;
   double bw_initial;
   tmgr_trace_t bw_trace;
   double lat_initial;
   tmgr_trace_t lat_trace;
-  e_surf_network_link_state_t state_initial = SURF_NETWORK_LINK_ON;
-  e_surf_network_link_sharing_policy_t policy_initial =
-      SURF_NETWORK_LINK_SHARED;
+  e_surf_network_link_state_t state_initial_link = SURF_NETWORK_LINK_ON;
+  e_surf_network_link_sharing_policy_t policy_initial_link = SURF_NETWORK_LINK_SHARED;
   tmgr_trace_t state_trace;
 
-  name = xbt_strdup(A_surfxml_network_link_name);
-  surf_parse_get_double(&bw_initial, A_surfxml_network_link_bandwidth);
-  surf_parse_get_trace(&bw_trace, A_surfxml_network_link_bandwidth_file);
-  surf_parse_get_double(&lat_initial, A_surfxml_network_link_latency);
-  surf_parse_get_trace(&lat_trace, A_surfxml_network_link_latency_file);
-
-  xbt_assert0((A_surfxml_network_link_state ==
-	       A_surfxml_network_link_state_ON)
-	      || (A_surfxml_network_link_state ==
-		  A_surfxml_network_link_state_OFF), "Invalid state");
-  if (A_surfxml_network_link_state == A_surfxml_network_link_state_ON)
-    state_initial = SURF_NETWORK_LINK_ON;
-  else if (A_surfxml_network_link_state ==
-	   A_surfxml_network_link_state_OFF)
-    state_initial = SURF_NETWORK_LINK_OFF;
-
-  if (A_surfxml_network_link_sharing_policy ==
-      A_surfxml_network_link_sharing_policy_SHARED)
-    policy_initial = SURF_NETWORK_LINK_SHARED;
-  else if (A_surfxml_network_link_sharing_policy ==
-	   A_surfxml_network_link_sharing_policy_FATPIPE)
-    policy_initial = SURF_NETWORK_LINK_FATPIPE;
-
-  surf_parse_get_trace(&state_trace, A_surfxml_network_link_state_file);
-
-  network_link_new(name, bw_initial, bw_trace, lat_initial, lat_trace,
-		   state_initial, state_trace, policy_initial);
-}
+  name_link = xbt_strdup(A_surfxml_link_id);
+  surf_parse_get_double(&bw_initial, A_surfxml_link_bandwidth);
+  surf_parse_get_trace(&bw_trace, A_surfxml_link_bandwidth_file);
+  surf_parse_get_double(&lat_initial, A_surfxml_link_latency);
+  surf_parse_get_trace(&lat_trace, A_surfxml_link_latency_file);
+
+  xbt_assert0((A_surfxml_link_state ==
+	       A_surfxml_link_state_ON)
+	      || (A_surfxml_link_state ==
+		  A_surfxml_link_state_OFF), "Invalid state");
+  if (A_surfxml_link_state == A_surfxml_link_state_ON)
+    state_initial_link = SURF_NETWORK_LINK_ON;
+  else if (A_surfxml_link_state ==
+	   A_surfxml_link_state_OFF)
+    state_initial_link = SURF_NETWORK_LINK_OFF;
+
+  if (A_surfxml_link_sharing_policy ==
+      A_surfxml_link_sharing_policy_SHARED)
+    policy_initial_link = SURF_NETWORK_LINK_SHARED;
+  else if (A_surfxml_link_sharing_policy ==
+	   A_surfxml_link_sharing_policy_FATPIPE)
+    policy_initial_link = SURF_NETWORK_LINK_FATPIPE;
+
+  surf_parse_get_trace(&state_trace, A_surfxml_link_state_file);
+
+  current_property_set = xbt_dict_new();
+  network_link_new(name_link, bw_initial, bw_trace, lat_initial, lat_trace,
+		   state_initial_link, state_trace, policy_initial_link, current_property_set);
+
+ }
 
 static void route_new(int src_id, int dst_id,
 		      network_link_L07_t * link_list, int nb_link)
@@ -837,11 +861,15 @@ static int link_list_capacity;
 static network_link_L07_t *link_list = NULL;
 static int src_id = -1;
 static int dst_id = -1;
+static int is_first =0;
 
 static void parse_route_set_endpoints(void)
 {
   cpu_L07_t cpu_tmp = NULL;
 
+  if (!is_first) create_routing_table();
+  is_first = 1;	
+
   cpu_tmp = (cpu_L07_t) name_service(A_surfxml_route_src);
   xbt_assert1(cpu_tmp, "Invalid cpu %s", A_surfxml_route_src);
   if (cpu_tmp != NULL)
@@ -868,11 +896,11 @@ static void parse_route_elem(void)
   }
   TRY {
     link_list[nb_link++] =
-	xbt_dict_get(network_link_set, A_surfxml_route_element_name);
+	xbt_dict_get(network_link_set, A_surfxml_link_c_ctn_id);
   }
   CATCH(e) {
     RETHROW1("Link %s not found (dict raised this exception: %s)",
-	     A_surfxml_route_element_name);
+	     A_surfxml_link_c_ctn_id);
   }
 }
 
@@ -886,27 +914,16 @@ static void parse_file(const char *file)
 {
   int i;
 
-  /* Figuring out the cpus */
+  /* Adding callback functions */
   surf_parse_reset_parser();
-  ETag_surfxml_cpu_fun = parse_cpu;
-  surf_parse_open(file);
-  xbt_assert1((!surf_parse()), "Parse error in %s", file);
-  surf_parse_close();
-
-  create_routing_table();
-
-  /* Figuring out the network links */
-  surf_parse_reset_parser();
-  ETag_surfxml_network_link_fun = parse_network_link;
-  surf_parse_open(file);
-  xbt_assert1((!surf_parse()), "Parse error in %s", file);
-  surf_parse_close();
-
-  /* Building the routes */
-  surf_parse_reset_parser();
-  STag_surfxml_route_fun = parse_route_set_endpoints;
-  ETag_surfxml_route_element_fun = parse_route_elem;
-  ETag_surfxml_route_fun = parse_route_set_route;
+  surfxml_add_callback(STag_surfxml_host_cb_list, &parse_cpu_init);
+  surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
+  surfxml_add_callback(STag_surfxml_link_cb_list, &parse_network_link_init);
+  surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
+  surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem);
+  surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
+
+  /* Parse the file */
   surf_parse_open(file);
   xbt_assert1((!surf_parse()), "Parse error in %s", file);
   surf_parse_close();
@@ -918,7 +935,7 @@ static void parse_file(const char *file)
 	loopback = network_link_new(xbt_strdup("__MSG_loopback__"),
 				    498000000, NULL, 0.000015, NULL,
 				    SURF_NETWORK_LINK_ON, NULL,
-				    SURF_NETWORK_LINK_FATPIPE);
+				    SURF_NETWORK_LINK_FATPIPE,NULL);
 
       ROUTE(i, i).size = 1;
       ROUTE(i, i).links = xbt_new0(network_link_L07_t, 1);
@@ -1009,6 +1026,9 @@ static void model_init_internal(void)
   surf_workstation_model->extension_public->get_link_latency =
       get_link_latency;
 
+  surf_workstation_model->common_public->get_link_properties = get_link_properties;
+  surf_workstation_model->common_public->get_cpu_properties = get_properties;
+
   workstation_set = xbt_dict_new();
   network_link_set = xbt_dict_new();
 
diff --git a/src/xbt/xbt_sg_synchro.c b/src/xbt/xbt_sg_synchro.c
index 65e69d9589..306436d45c 100644
--- a/src/xbt/xbt_sg_synchro.c
+++ b/src/xbt/xbt_sg_synchro.c
@@ -45,7 +45,7 @@ xbt_thread_t xbt_thread_create(const char*name,void_f_pvoid_t code, void* param)
    res->s_process = SIMIX_process_create(name, 
 					 xbt_thread_create_wrapper, res,
 					 SIMIX_host_get_name(SIMIX_host_self()),
-					 0, NULL);
+					 0, NULL,/*props*/NULL);
 //   free(name);
    return res;
 }